39 files changed, 80452 insertions, 63863 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4359e5ebd7..3de2c7eee6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-02  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2002-07-31  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
+2002-07-31  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
 2002-07-30  Hector Garcia Alvarez  <hector@scouts-es.org>
 
     * es.po: Updated Spanish translation.
diff --git a/po/az.po b/po/az.po
index 55326f2989..16305d4066 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.99.2\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-12-19 19:21GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -35,7 +35,7 @@ msgstr "VCard fayllarını Evolution içinə gətirir."
 msgid "File As"
 msgstr "Fərqli Qeyd Et"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ad"
@@ -343,46 +343,46 @@ msgstr "%s üçün VCard"
 msgid "Could not initialize Bonobo"
 msgstr "Bonoboyu başlada bilmədim"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Axtarılır..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Yüklənir ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Axtarış ifadəsində xəta."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "LDAP vericiyə kart əlavə edilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "LDAP vericidən kart çıxardılır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP vericidəki kart təkmilləşdirilir..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Axtarış yenidəm başladılır."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP axtarış nəticələri alınır..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL `%s' alına bilmir"
@@ -474,11 +474,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Əlaqələr"
 
@@ -494,23 +494,32 @@ msgstr "LDAP Vericisi"
 msgid "LDAP server containing contact information"
 msgstr "Əlaqələr məlumatını daxil edən LDAP verici."
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Yeni Əlaqə"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Əlaqə"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Yeni bir hesab yarat"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Yeni Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Əlaqə Siyahısı"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Yeni Əlaqə"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Əlaqə"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Yeni bir əlaqə siyahısı yarat"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -533,30 +542,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs-ni başlada bilmədim"
 
@@ -564,11 +573,11 @@ msgstr "gnome-vfs-ni başlada bilmədim"
 msgid "Other Contacts"
 msgstr "Digər Əlaqələr"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Ünvan dəftərini aça bilmədim"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -577,7 +586,7 @@ msgstr ""
 "Bu ünvan dəftərini aça bilmirik. Ya səhv URL bildirdiniz,\n"
 "ya da LDAP verici işləmir."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -589,7 +598,7 @@ msgstr ""
 "üçün aşağıdakı körpüdən alacağınız OpenLDAP yardımıyla\n"
 "endirib CVS üstündə proqramın mənbə kodunu yenidən dərləməlisiniz.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -597,44 +606,44 @@ msgstr ""
 "Bu ünvnan dəftərini aça bilmədik.  Xahiş edirik,\n"
 "cığırın mövcudiyyətini və üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s üçün parol girin (istifadəçi %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "sonlanır"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "2-ci ePoçt ünvanı"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateqoriya"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Daxil edən hər hansı üzv"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Qovluq Səyyahını göstərəcək olan URI"
 
@@ -756,7 +765,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Ünvan Dəftəri Qaynağı"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -850,8 +859,8 @@ msgstr "Quraşdırma"
 msgid "Mappings"
 msgstr "Kənarlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_hər"
@@ -903,8 +912,8 @@ msgstr "Axtarışın əhatə _sahəsi:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Axtarılır"
 
@@ -1093,15 +1102,15 @@ msgid "Using email address"
 msgstr "_Bu ePoçt ünvanıdır"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Əlavə Et"
 
@@ -1147,12 +1156,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Düzəlt"
@@ -1267,10 +1276,10 @@ msgstr "Evolution Ünvan Dəftəri ad seçmə ara üzü emalatxanası"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Sil"
 
@@ -1299,42 +1308,15 @@ msgstr "(%d göstərilmir)"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Ünvan Dəftərindən Əlaqələri Seçin"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Daxil edən yollayıcılar"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution ünvan dəftərinin yerli daxılını əldə edə bilmir.\n"
-"Bu, evolution-addressbook qisminin çökməsindən ötrü ola bilər.\n"
-"Bizə problemi anlamqda yardımçı olmaq üçün xahiş edirik,\n"
-"Jon Trowbridge <trow@ximian.com> ünvanına ətraflı xəta raportu\n"
-"göndərəsiniz. Minnətdarıq."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution ünvan dəftərinin yerli daxılını əldə edə bilmir.\n"
-"Normal hallarda bu, heç bir vaxt olmamalıdır.\n"
-"Problemi həll etmək üçün Evolution proqramının\n"
-"yenidən başladılması lazım gələ bilər."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Ünvan Dəftərindən Əlaqələri Seçin"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Ad Seç"
@@ -1356,15 +1338,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Daşı ..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kateqoriya:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Qovluq:"
 
@@ -1479,11 +1456,12 @@ msgstr "_HTML ePoçtlarını qəbul edir"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -2722,7 +2700,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Bu siyahıya məktub göndərəndə ünvanları _gizlə"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Çıxart"
 
@@ -2786,7 +2764,7 @@ msgstr ""
 "mövcuddur. Bunu yenə də əlavə etmək istəyirsiniz?."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
@@ -2814,21 +2792,21 @@ msgid "Error getting book view"
 msgstr "%s başladırkən xəta oldu"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -2836,8 +2814,8 @@ msgstr "Naməlum xəta"
 msgid "Repository offline"
 msgstr "Nüsxə xətdən deyil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Qadağandır"
 
@@ -2854,7 +2832,7 @@ msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2877,48 +2855,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "`%s' faylı yoxdur"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Dəyişiklikləri qeyd etmək istəyirsinizimi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Kart əlavə etmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kart çıxartma xətası"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Ekran"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Ekran"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2926,22 +2909,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yoxdur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kart yoxdur"
@@ -3014,7 +2997,7 @@ msgstr "Ünvan Dəftəri"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olaraq qeyd et"
 
@@ -3054,7 +3037,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot Qurğuları..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Çatdır"
 
@@ -3063,8 +3046,8 @@ msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Çap Et"
@@ -3084,7 +3067,7 @@ msgid "Move to folder..."
 msgstr "Qovluğa _Daşı ..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
@@ -3095,20 +3078,20 @@ msgid "Copy"
 msgstr "Köçürt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Hazırkı Görünüş"
@@ -3277,7 +3260,7 @@ msgstr "Kənarlar"
 msgid "Number of columns:"
 msgstr "Sütunların miqdarı :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Seçənəklər"
 
@@ -3367,26 +3350,26 @@ msgstr "Adsız görüş"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Yüksək"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Alçaq"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Təsvirsiz"
@@ -3510,11 +3493,11 @@ msgstr "Xəbərdarlıq vaxtı ( dəqiqə )"
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3526,13 +3509,13 @@ msgstr ""
 "üçün qurulubdur.  Evolution yerinə normal\n"
 "xatırlatma ekranı göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3549,7 +3532,7 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Mənə bir də soruşma."
@@ -3578,7 +3561,7 @@ msgstr "Daxil edən izah"
 msgid "Comment contains"
 msgstr "Daxil edən şərh"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
@@ -3589,7 +3572,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %b %d"
 
@@ -3611,19 +3594,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Təqvimin görünüşü quraşdırıla bilmir. Lütfən ORBIT və OAF qurğularınızı "
 "yoxlayın."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Şəxsi"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
@@ -3648,37 +3631,37 @@ msgstr "E"
 msgid "W"
 msgstr "Çərş."
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Boş"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Məşğul"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamayıb"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşləyir"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Bitirmə Tarixi"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3689,56 +3672,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Təkrarlayan"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Bəli"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Xeyr"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Gündəlik Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "İş Həftəsi Nümayişi"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Həftəlik Nümayiş"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Təqvim"
 
@@ -3746,12 +3728,12 @@ msgstr "Təqvim"
 msgid "Folder containing appointments and events"
 msgstr "Görüş və hadisələri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Vəzifə"
 
@@ -3759,44 +3741,62 @@ msgstr "Vəzifə"
 msgid "Folder containing to-do items"
 msgstr "Ediləcəkləri daxil edən qovluq"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Yeni İclas"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "İclas"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Yeni bir iclas yarat"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Xəbərlər Qurğuları"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "İclas"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Yeni bir vəzifə yarat"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Yeni bir vəzifə yarat"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Yeni İclas"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Yeni İclas"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "İclas"
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir iclas yarat"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3863,7 +3863,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "gün"
 
@@ -3871,11 +3872,13 @@ msgstr "gün"
 msgid "extra times every"
 msgstr "hər əlavə vaxtda"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "dəqiqə"
 
@@ -4003,7 +4006,7 @@ msgstr "Xatırladıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4032,7 +4035,7 @@ msgstr "görüşün sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -4210,7 +4213,7 @@ msgid "_Fri"
 msgstr "_Cüm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Ümumi"
 
@@ -4255,19 +4258,33 @@ msgstr "_Çər"
 msgid "before every appointment"
 msgstr "iclas başlamadan əvvəl"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Görüş vəziyyəti dəyişdi. Güncəllənmiş nüsxəsini yollayaq?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bu iclası həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
 
@@ -4339,61 +4356,61 @@ msgstr " (Ait "
 msgid "Due "
 msgstr "Aidiyyət"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Cism güncəllənə bilmədi!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "İclası düzəlt"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "İclas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal üzvü - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Hazırkı buraxılış öyrənilə bilmədi!"
 
@@ -4596,7 +4613,7 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4608,7 +4625,7 @@ msgstr "Rolu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Hal"
@@ -4693,7 +4710,7 @@ msgstr "..da"
 msgid "first"
 msgstr "siyahı"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "saniyə"
 
@@ -4717,7 +4734,7 @@ msgstr "siyahı"
 msgid "Other Date"
 msgstr "Başqa faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "gün"
 
@@ -4817,20 +4834,26 @@ msgstr "% Qurtardı"
 msgid "Date Completed:"
 msgstr "Bitirmə Tarixi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Hərəkət Lazımdır"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Gedişat"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Üstünlük:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Hal:"
 
@@ -4844,7 +4867,7 @@ msgstr "Əsas"
 msgid "Assignment"
 msgstr "Vəzifələndirilmiş"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4913,80 +4936,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Fərqli qeyd et ..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Çap Et ..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kə_s"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Köçürt"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Vəzifə Ver"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Vəzifələri Qurtardı deyə _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Cismlər güncəllənir"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqla"
@@ -4995,8 +5018,8 @@ msgstr "Vəzifə əlavə etmək üçün tıqla"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Qurtar"
 
@@ -5024,11 +5047,9 @@ msgstr "Üstünlük"
 msgid "Start Date"
 msgstr "Başlama Tarixi"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Mündəricat"
 
@@ -5070,110 +5091,109 @@ msgstr "%02i dəqiqə bölmələri"
 
 #. 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Yeni _Görüş"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Gün _Hadisəsi"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "İclas"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Çap Et ..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını _Dərc Et"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Quraşdırma"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Quraşdırma"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et ..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Görüşləri Planlaşdır"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "v_Calendar şəklində çatdır"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Bu Vaqeənin _Daşına Bilməsinə İmkan Ver"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqeəni Sil"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqeələri Sil"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vasitəlri deyəsən sistemə qurulu deyil."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
@@ -5214,7 +5234,7 @@ msgstr "Vəzifə Qurtardı: <b>"
 msgid "Task Due: <b>"
 msgstr "Vəzifə Vaxtı: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar Məlumatı"
 
@@ -5223,12 +5243,12 @@ msgstr "iCalendar Məlumatı"
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Naməlum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5236,324 +5256,331 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı məlumatı gözdən keçirdin və aşağıdakı menüdən "
 "gediçi seçin."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Coğrafi Yerləşmə:  "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Hal:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Naməlum"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Gediş seç:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Güncəllə"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Girişimli qəbul et"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini güncəllə"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Ən Son Məlumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> görüş məlumatını dərc edib."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Görüş Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Görüş Güncəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ən son görüş məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Görüş Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> görüş istəyini cavabladı."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> görüşü ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> pozğun ismarış yolladı."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> vəzifə məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Vəzifə Gencəllənməsi"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ən son vəzifə məlumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Vəzifə Güncəllənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vəzifə verilməsinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> vəzifəni ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> sərbəst/məşğul məlumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizin sərbəst/məşğul məlumatınızı istəyir."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Bu ismarış təkə dəstəklənməyən istəklər daxil edir."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "İlişgidəki hökmlü təqvim ismarışı daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "İlişgidəki göstəriləbilən təqvim üzvləri daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Gübcəlləmə Qurtardı\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Təqvim faylı güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü güncəllənə bilmədi"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "İştirakçı vəziyyəti səhv haldan ötrü güncəllənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti güncəlləndi\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti güncəllən bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Çıxartma Qurtardı"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Qovluq Seçin"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Qovluq Seçin"
@@ -5599,7 +5626,7 @@ msgstr "başlama tarixi"
 msgid "Chair Persons"
 msgstr "İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Lazımi İştirakçılar"
 
@@ -5612,57 +5639,52 @@ msgid "Non-Participants"
 msgstr "Qeyri-İştirakçılar"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Şəxsi"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Qrup"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Mənbə"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Otaq"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Stul"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Lazımi İştirakçılar"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçılar"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Qeyri İştirakçılar"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Hərəkət Lazımdır"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Girişimli"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Temsil Edildi"
 
@@ -5752,49 +5774,46 @@ msgstr "İclas başlama saatı :"
 msgid "Meeting _end time:"
 msgstr "İclas sonlanma saatı :"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtl açılır"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "`%s' dakı (dəki) vəzifələr yüklənə bilmədi"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' i(ı) yükləməyə yarayan yol dəstəklənmir"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'da(də) qovluq yarada bilmədim"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Qurtarma Vaxtı"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili üzv silinir"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Qovluq açılır"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "Bu İclası _Sil"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5805,11 +5824,16 @@ msgstr "`%s'da(də) qovluq yarada bilmədim"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' i(ı) açmağa yarayan yol dəstəklənmir"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Təqvim %s vaxtı açılır"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s qovluğu açılır"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -5866,59 +5890,64 @@ msgstr "Oktyabr"
 msgid "September"
 msgstr "Sentyabr"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Ən az bir dinləyici vacibdir"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Təşkilatçı bildirlməlidir."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Vəzifə Məlumatı"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Sərbəst/Məşğul Məlumatı"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "təqvim məlumatı"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Güncəllə"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Siyahını Yenilə"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Siz hadisənin istirakçısı olmalısınız."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonoboyu başlada bilmədim"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Komponent düzəltmə emalatxanası yaradıla bilmir"
 
@@ -6146,9 +6175,8 @@ msgid "Print Calendar"
 msgstr "Təqvimi çap et"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Çap Etmə nümayişi"
 
@@ -6183,8 +6211,8 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Mənə bir də soruşma."
 
@@ -6249,17 +6277,29 @@ msgstr "VCard fayllarını Evolution içinə gətirir."
 msgid "Imports vCalendar files into Evolution"
 msgstr "VCard fayllarını Evolution içinə gətirir."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"İsmarış alına bilmir: %s qovluğundan %s\n"
+"   %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Ambara bağlana bilmirəm: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Xatırladıcı"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Təqvim İsmarışı"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6268,95 +6308,95 @@ msgstr ""
 "Evolution Pine məktub faylları tapdı.\n"
 "Onları proqramımıza idxal edək?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Təqvim"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "indiki-vaxt 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "vaxt-düzəlt 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "vaxt-düzəlt 1 qatar arqument gözləyir"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "vaxt-düzəlt arqumenti 1  ISO 8601 tarix/vaxt qatarı olmalıdır"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "vaxt-gün-əlavə-et 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "vaxt-gün-əlavə-et gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "vaxt-gün-əlavə-et gözlədiyi 2 arqumentinin tam sayı olmağını gözləyir"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "vaxt-gün-başlanğıcı 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "vaxt-gün-başlanğıcı gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "vaxt-gün-sonu 1 arqumentini gözləyir"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "vaxt-gün-sonu gözlədiyi 1 arqumentinin vaxt_t olmağını gözləyir"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 0 arqument gözləyir"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? time_t olan 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? time_t olan 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? 2 arqument gözləyir"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? qatar olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? qatar olan arqument 2 gözləyir"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains? \"hər hansı\", \"icmal\", \"izahat\" olan arqument 1 gözləyir"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? ən az 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6364,19 +6404,19 @@ msgstr ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 0 argument gözləyir"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 1 arqument gözləyir"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? time_t olan arqumnet 1 gözləyir"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Axtarış ifadəsi bulean qiymət qəbul etməz"
 
@@ -8077,72 +8117,82 @@ msgstr "%s qovluğu saxlanılır"
 msgid "You must be working online to complete this operation"
 msgstr "Bui əməliyyatı bitirmək üçün xətdə olmalısınız"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Alıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "İşə salıcı süzgəc xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Növbə faylını aça bilmədim"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Növbə faylını işlədə bilmirəm"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%d%%) İsmarışı alınır"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Bacarılmayan İsmarış %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d nin(nın) %d ismarışında iflas etdim"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Hökmsüz arqumentlər"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Hökmsüz arqumentlər"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "İşə salıcı süzgəc axtarışı xətası: %s: %s"
@@ -8198,7 +8248,7 @@ msgstr "İsmarışlar daşınır"
 msgid "Copying messages"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8206,47 +8256,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Ləğv Edildi."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP vericisindən gözlənilməz cavab alındı: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "fayl adı bildirilməyib."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "İsmarış kriptlənə bilmir: alıcı bildirilməyib."
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8254,18 +8304,18 @@ msgid ""
 "%.*s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "İsmarış kodu açıla bilmir."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış təsdiqlənə bilmir: Müvəqqəti fayl yaradıla bilmir: %s"
@@ -8291,22 +8341,22 @@ msgid "Could not lock '%s'"
 msgstr "%s qıfıllana bilmir"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s üçün qıfıl faylını yarada bilmədim: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s dakı(dəki) qıfıl fayllının alınması müddəti doldu. Yenidən sına."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) istifadə edilərək qıfıl faylı alınması ifşlas etdi: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alınması iflas etdi: %s"
@@ -8365,11 +8415,15 @@ msgstr "Müvəqqəti məktub faylı yazılması xətası: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Müvəqqəti məktub faylı köçürülmə xətası: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8504,7 +8558,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
@@ -8680,33 +8734,134 @@ msgstr "Qovluq alıa bilmir: Mənbədə hökmsüz əməliyyat"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Ambarda sənv əməliyyat aparılıb"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Vəsiqələr təsdiqlənə bilmir."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Məruzəçi: %s\n"
-"Mövzu: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Vəsiqələr təsdiqlənə bilmir."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"%sdan(dən) xəsərli vəsizqə:\n"
-"\n"
-"%s\n"
-"\n"
-"Yenə də qəbul etmək istəyirsiniz?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Imza faylı : "
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Vəsiqə ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%s yüklənərkən xəta oldu"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "İş Yerində Deyil"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Vəsiqələr təsdiqlənə bilmir."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Vəsiqə ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Səhv qrqument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Vəsiqə ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Vəsiqə ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8715,16 +8870,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%sdan(dən) xəsərli vəsizqə:\n"
+"\n"
+"%s\n"
+"\n"
+"Yenə də qəbul etmək istəyirsiniz?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8744,32 +8916,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' alına bilmir"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%s başladırkən xəta oldu"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "\"%s\"da(də) %s deye bir ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Belə qovluq yoxdur"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
@@ -8777,12 +8954,12 @@ msgstr "Qovluq adı dəyişdirilə bilmir: %s: Belə qovluq yoxdur"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlanilməz şakildə bağlantını kəsdi: %s"
@@ -8811,40 +8988,40 @@ msgstr "IMAP vericisi cavabı %s məlumatını daxil etmir"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP vericisindən gözlənilməz qəbul cavabı alındı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s qovluğunu yarada bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 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:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yerinə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışda dəyişikliklər daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcuddur"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmalı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -8853,10 +9030,10 @@ msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 msgid "Could not open cache directory: %s"
 msgstr "Ön yaddaş qovluğunu aça bilmədim: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s ismarışı ön yaddaşa alına bilmədi: %s"
@@ -8869,7 +9046,7 @@ msgstr "Yeni ePoçt üçün baxılır"
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Qovluqlar"
 
@@ -8899,7 +9076,7 @@ msgstr "IMAP vericisində məktubların saxlanması və oxuna bilməsi üçün."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Parol"
 
@@ -8908,73 +9085,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Bu seçənəklə siz IMAP vericisinə düz mətn parol ilə bağlana biləcəksiniz."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s üstündə %s üçün %s xidmətləri"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Bağlantı Ləğv edildi"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Əməliyyat dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Tanıtma bacarılmadı."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Qovluq boş deyil"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Tanıtma növü dəßtəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün IMAP parolunu girin"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Parolu girmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8985,31 +9166,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "%s deyə bir qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Qovluq ad Return xarakteri daxil edə bilməz."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Əlaqəli qovluğun alt qovluqlara malik olmağına icazə verilməyib"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Məktub qutusu açıla bilmir: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9031,7 +9218,10 @@ msgid "Local delivery"
 msgstr "Yerli göndərişlər"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Standart mbox şəklindəki məktubların saxlanması üçün."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9059,12 +9249,12 @@ msgstr "Standart UNIX poçt qutusu hovuzu"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Yerli məktubları mbox tərzi məktub cərgələrində saxlaya bilmək üçün."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9075,38 +9265,38 @@ msgstr "%s kök saxlama dəqiq bir yol deyildir"
 msgid "Store root %s is not a regular directory"
 msgstr "%s kök saxlama düzgün bir qovluq deyildir."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Yerli saxlamaların gələnlər qutusu qovluğu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s Yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s faylı %s adi ilə yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "`%s' Qovluq mündəricat faylı silinə bilmir: %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' Qovluq indeks faylı silinə bilmir: %s"
@@ -9166,7 +9356,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9204,26 +9394,26 @@ msgstr "məktub qovluğu faylı deyildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Məktub cərgəsi qovluğu cığırı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Yeni ePoçt üçün baxılır"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Yeni ismarışlar daranır"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Qovluqlar saxlanılır"
@@ -9267,7 +9457,7 @@ msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "İSmarıc quruluşu bacarılmadı: Məktub qutusu yoxsa xəsərlidir?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9276,7 +9466,7 @@ msgstr ""
 "`%s' Faylı açıla bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9285,14 +9475,14 @@ msgstr ""
 "`%s' faylı yaradıla bilmədi: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir fayl deyildir ."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9301,7 +9491,7 @@ msgstr ""
 "`%s' qovluğu silinə bilmir:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyildir. Silinmədi."
@@ -9316,65 +9506,65 @@ msgstr "Qovluq açıla bilmir: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "%ld yeri yaxınlığında %s qovluğunda ciddi məktub darama xətası"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Qovluq yoxlana bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Faylı açıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Qaynaq qovluğu bağlana bilmədi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Toplama və qovluq bir birinə uyğun gəlmir, sinxronizasiyadan sonra da əlbətdə"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Naməlum xəta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Müvəqqəti məktub qutusuna yazıla bilmir: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Müvəqqəti məktub qutusuna yazılma bacarılmadı: %s: %s"
@@ -9527,50 +9717,50 @@ msgstr "Ləğv Et"
 msgid "Operation failed: %s"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP yığcamlaşdırılması alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Qovluq alına bilmədi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Silinmiş ismarışlar açılır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s uid'li ismarış yoxdur"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "İSmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Naməlum yağmur"
@@ -9588,7 +9778,7 @@ msgstr "İsmarışları Vericidə burax"
 msgid "Delete after %s day(s)"
 msgstr "%s gün sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9615,6 +9805,11 @@ msgstr ""
 "quracaqdır. Bu seçənək bütün vericilər tərəfindən bütün istifadəçilər üçün "
 "dəstəklənməz."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "%s a(ə) bağlana bilmirəm (qapı %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9626,54 +9821,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "%s üstündəki POP vericisi ilə ünsiyyət qurula bilmir."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstənən tanıtma protokoluna dəstək verilmir."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "G/Ç xətası"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün POP3 parolunuzu girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "Parol göndərmə xətası oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9700,35 +9897,35 @@ msgstr "Sendmailə boru(pipe) çəkilə bilmədi bilmədi. %s: məktub göndəri
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Sendmail çəngəllənə bilmədi: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "İsmarış göndərilə bilmədi: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s siqnalı verərək bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s işə salına bilmir: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d halı ilə bağlandı: məktub göndərilə bilmədi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9838,45 +10035,45 @@ msgstr "Müvəqqəti tanıtma iflası"
 msgid "Authentication required"
 msgstr "Tanıtma lazımdır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Xoş gəldin ismarışı cavab xətası: %s: ağır deyil dəyəsən"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP vericisinə bağlana bilmədim.\n"
 "İstifadəçi adı göndərilmə xətası oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu ismarış düzgün qurulmuşa oxşamır"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP vericisi %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfən %s@%s üçün SMTP parolunu girin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9887,90 +10084,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s dan(dən) SMTP məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO istək vaxtı doldu: %s: ağır deyil"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO cavablama xətası: %s. ağır deyil"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET istək vaxt dolması. %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "SASL tanıtma cismi yaratma xətası."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH istək bacarılmadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Vericidən xətalı tanıtma istəyi alındı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAİL FROM istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAİL FROM cavablama xətası: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO istək vaxt dolması: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
@@ -9978,91 +10175,91 @@ msgstr "DATA istək vaxt dolamsı. %s: məktub göndərilə bilmədi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA göndərmə vaxt dolması: ismarış qurtarılır: %s: məktub göndərilə bilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Vericidən xətalı tanıtma istəyi alındı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUİT istək vaxt dolması: %s: ağır xəta"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH istək vaxt dolması. %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET cavablama xətası: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "yapışdırılmış fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri yapışdırılmış fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Yapışdırılmış fayl əlavə et ..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl əlavə et"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Fayl ilişdirmə bacarılmadı: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s faylı ilişdirilə bilmir: sıravı fayl deyildir"
@@ -10080,56 +10277,60 @@ msgid "MIME type:"
 msgstr "MIME növü:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmişin öz-özünə göstərilməyini tövsiyyə et"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Ünvan dəftəri üçün buraya tıqla"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Göndərən:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Cavab ver"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Göndərən:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Mövzu :"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "İsmarışın göndərildiği adamlar"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İsmarışın nüsxəsinin göndəriləcəyi ünvanlar"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10137,17 +10338,25 @@ msgstr ""
 "İsmarışın nüsxələrinin göndəriləcəyi ünvanları bildir; bunlar özlərini "
 "ismarışın göndərildiği adamlar arasında görməyəcəkdir ."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Qapı:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bir fayl yapışdır"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza məzmunu yaradıla bilmir."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10156,34 +10365,34 @@ msgstr ""
 "%s faylı oxunurkən xəta oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Xəbərdarlıq!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fayl mövcuddur, üstünə yazaq?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fayl qeyd edərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fayl yüklərkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fayla yetişilirkən xəta oldu: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Editordan ismarışlar alına bilmir"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10192,7 +10401,7 @@ msgstr ""
 "Faylda axtarış aparıla bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10201,7 +10410,7 @@ msgstr ""
 "Fayl parçalana bilmir: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10210,7 +10419,7 @@ msgstr ""
 "İsmarışın öz-özünə qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10218,7 +10427,7 @@ msgstr ""
 "Ximian Evolution əvvəlki iclasdan qalan qeyd edilməmiş fayllar tapdı.\n"
 "Onları indi bərpa etməyə cəhd etməyimi istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10228,43 +10437,39 @@ msgstr ""
 "\n"
 "Dəyişiklikləri qeyd etmak istəyirsiniz?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Faylı Daxil Et"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Imzanı qeyd et"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (varsayılan) "
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Bir ismarış yaz"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10272,7 +10477,7 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10280,9 +10485,9 @@ msgstr ""
 "Yazıçı pəncərəsi yaradıla bilmir:\n"
 "HTML editor parçası fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10347,8 +10552,8 @@ msgstr "Daxil edən mövzu"
 msgid "Subject does not contain"
 msgstr "Daxil etməyən mövzu"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10356,12 +10561,11 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da vardır.\n"
 "Üstünə yazım mı?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Bu parolu yadda saxla"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Bu iclas boyunca bu parolu yadda saxla"
 
@@ -10460,150 +10664,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "il"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "il"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "saniyə"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "ay"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "dəqiqə"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "ay"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "saat"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "həftə"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "saat"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "ay"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "dəqiqə"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "ay"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "saniyə"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "il"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "il"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Vaxsey. Tarix seçməyi unutmusan."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Vaxsey. Hökmsüz tarixi seçmisən."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Bu ismarış tarixi süzgəcin işlədiyi və ya\n"
-"vfolderin açıq qaldığı müddət ilə müqayisə\n"
-"ediləcəkdir."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Bu ismarış tarixi burada göstərdiyiniz ilə\n"
-"müqayisə ediləcəkdir."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Bu ismarış tarixi süzgəcin işlədiyi müddət\n"
-"ilə müqayisə edilaəkdir;\n"
-"\"bir haftə əvval\" məsələn."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "indiki vaxt"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "bildirdiyin vaxt"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "indiki vaxta görə müddət"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Müqayisə ediləcək vaxtı seçin"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Müqayisə et"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "indi"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " əvvəl"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "əvvəl"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " əvvəl"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<vaxtı görə bilmək üçün buraya tıqlayın>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Müqayisə ediləcək vaxtı seçin"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Süzgəc Qaydaları"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Tərz adı :"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' normal vir hovuz deyil ya da sıravı bir fayl deyildir"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Gediş seç:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Onda"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Gediş əlavə et"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10611,12 +10765,12 @@ msgstr ""
 "Qovluq seçməyi unutdunuz.\n"
 "Lütfən arxaya gedin və məktubların toplanacağı hökmlü bir qovluq seçin."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Qovluq Seçin"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10625,92 +10779,167 @@ msgstr ""
 "'%s' qaydalı ifadələrdə xəta oldu:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Vacib"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "İşləyir"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Toqo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sonra"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Sınaq"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Bu süzgəcə ad verməlisiniz."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Qayda adı :"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Adsız"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Əgər"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Gedişi işə sal"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "bütün kriteriyalar uyğun gəlirsə"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Kriteriya əlavə et"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "gələn"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "gedən"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Müqayisə et"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Süzgəcləri Düzəlt"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "VFolderləri Düzəlt"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Gələn"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Gedən"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Bu ismarış tarixi burada göstərdiyiniz ilə\n"
+"müqayisə ediləcəkdir."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Bu ismarış tarixi süzgəcin işlədiyi müddət\n"
+"ilə müqayisə edilaəkdir;\n"
+"\"bir haftə əvval\" məsələn."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Bu ismarış tarixi burada göstərdiyiniz ilə\n"
+"müqayisə ediləcəkdir."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtual Qovluqlar"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "indiki vaxta görə müddət"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "əvvəl"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "təkcə xüsusi qovluqlar"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "indiki vaxt"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "bildirdiyin vaxt"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vFolder Qaynaqları"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "bütün fəal uzaq qovluqlarla"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "bütün yerli və fəal uzaq qovluqlarla"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "bütün yerli qovluqlarla"
 
@@ -10738,42 +10967,42 @@ msgid "Beep"
 msgstr "Beliz"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Şirkət"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "daxil edir"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçürt"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "daxil etmir"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ilə sonlanmır"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "yoxdur"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "yoxdur"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "oxçamır"
@@ -10795,92 +11024,88 @@ msgid "ends with"
 msgstr "sonlanır"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Mövcuddur"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "mövcuddur"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Vacib"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "dir(dır)"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "sonra idi"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "əvvəl idi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Bayraqlı"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "böyükdür"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "azdır"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "deyil"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Bayraqlı"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "İsmarış Gövdəsi"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Qovluğa Köçür"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Əlaqəyə İsmarış Göndər"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Səs çal:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Oxu"
 
@@ -10896,57 +11121,87 @@ msgstr "Regex Uyğunluqları"
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Məs"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "böyükdür"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "azdır"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Hal Seç"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Şirkət"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "oxşayır"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Xas başlıq"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "başlayır"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "İşi Dayandır"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Hal Seç"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Qaydalar"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Qaydanı Düzəlt"
 
@@ -10954,11 +11209,11 @@ msgstr "Qaydanı Düzəlt"
 msgid "Score Rules"
 msgstr "Qiymətləndirmə Qaydaları"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Bu vfolder-ə ad verməlisiniz."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 
@@ -10966,31 +11221,31 @@ msgstr "Mənbə olarq ən az bir qovluq bildirməlisiniz."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Alınır..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s %s olaraq idxal edilir"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s daranır"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Məktub"
 
@@ -11051,39 +11306,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərini idxal edir"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Zibil Qutusu"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s Yeli məktub faylı"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Qovluq daranır"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "İdxal başlanır"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Qurğular"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Süzgəcləri Düzəlt"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11164,12 +11419,12 @@ msgstr "Məktub Mündəricatı parçası emalatxanası."
 msgid "Font Preferences"
 msgstr "Təkrarlama _yoxudr"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Hesablar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11217,7 +11472,7 @@ msgstr "Xüsusiyyətlər..."
 msgid "Change this folder's properties"
 msgstr "Qovluqların seçənəklərini dəyişdir"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11225,58 +11480,78 @@ msgstr ""
 "Bəzi məktub qurğularınız deyəsən xəsarət görüb, xahiş edirik, hər şeyin "
 "yerində olub olmadığını yoxlayın."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Məktub nəql yolunu bildirməmisən"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Xəbərdarlıq: Düzəldilmiş İsmarış"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Bir ismarış yaz"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Sonrakı İsmarış"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Əvvəlki İsmarış"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Yeni Məktub İsmarışı"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionun ePoçt parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionun poçt quraşdırma parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionun qovluq info parçasını başlada bilmədim ."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vericiyə bağlantı qurulur..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Nüsxəni qabıq ilə qeyd edə bilmədim"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"in Seçənəkləri"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Seçənəklər"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
@@ -11326,135 +11601,135 @@ msgstr "cəmi %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "İsmarışdan _Virtual Qovluq Yarat"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "_Mövzudakı vFolder"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Gön_dərəndəki vFolder"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "_Alıcıdakı vFolder"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma Q_rupundakı VFolder"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Mö_vzudakı Süzgəc"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Gön_dərəndəki  Süzgəc"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıdakı Süzgəc"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupundakı Süzgəc"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Ver"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Ver"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Ver"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Çatdır"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bitirmə Tarixi"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Təmizlə"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq İşarələ"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq İşarələ"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-Vacib olaraq İşarələ"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan dəftərinə Əlavə Et"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Süzgəclər Əlavə Et"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qa_yda Yarat"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Məktublaşma Qrupundakı VFolder"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Məktublaşma Qrupunda Süz (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "(%s) Məktublaşma Qrupundakı VFolder"
@@ -11519,76 +11794,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution Xəbər Düzəldicisi"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Düzəldicisi"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "İ_stifadəci Adı:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adda və iki hesab yarada bilməzsiniz."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Silmə"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Həqiqətən də hesabı silək?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Bağla"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Bu xəbər hesabını həqiqətən də silmək istəyirsiniz?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Fəal"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Hesab adı:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Riko"
@@ -11598,30 +11864,30 @@ msgstr "Porto Riko"
 msgid "Mail to %s"
 msgstr "%s a(ə) məktub göndər"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s dir(dır)"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Məktub %s dandır(dəndir)"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11633,7 +11899,7 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11645,7 +11911,7 @@ msgstr ""
 "bunu quraşdırmalısınız.\n"
 "Bunu indi quraşdırmaq istəyirsiniz?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11653,7 +11919,7 @@ msgstr ""
 "ePoçt göndərməkdən əvvəl bir \n"
 "şəxs tanıtmalısan."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11662,7 +11928,7 @@ msgstr ""
 "nəqliyyatını qurmalısan."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11670,11 +11936,11 @@ msgstr ""
 "HTML şəklində imsarış göndərirsiniz, amma aşağıdakı alıcılar HTML şəklində "
 "məktub istəmirlər:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Yenə də yollayaq?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11682,7 +11948,7 @@ msgstr ""
 "Bu ismarışın mövzusu yoxdur .\n"
 "Həqiqətən də göndərim?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11690,11 +11956,11 @@ msgstr ""
 "Nə vaxta qədər ki, əlaqə siyahınız qrup ünvanıarını gizləyəcək şəkildə "
 "sazlanıb, bi ismarış təkcə Bcc alıcılar daxil edəcək."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "İsmarış təkcə Bcc alıcıları daxil edir."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11704,17 +11970,11 @@ msgstr ""
 "məlumatlndırmaq istəsin.\n"
 "Yenə də göndərək?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Məktubu göndərə bilmək üçün alıcını da bildirməlisən."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Bu ePoçtu göndərməkdən əvvəl bir ePoçt\n"
-"hesabını quraşdırmalısan."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11722,28 +11982,28 @@ msgstr ""
 "Bu hesab üçün lahiyə cərgəsə açıla bilmədi.\n"
 "Əsas lahiyə cərgəsini işlətmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "naməlum yollayan"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d at %H:%M, tarixidə %%s yazmışdır ki:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "İsmarış(ları) buraya daşı "
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "İsmarış(ları) buraya köçürt"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bütün `%d' ismarışlarını düzəltmək istəyirsiniz?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11751,7 +12011,7 @@ msgstr ""
 "Siz sadəcə olaraq Vəzifələr qovluğundakı\n"
 "ismarışları düzəldə bilərsiniz."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11759,39 +12019,39 @@ msgstr ""
 "Sadəcə olaraq Göndərilən cərgəsinə qeyd edilən\n"
 "ismarışları yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Həqiqətən də bütün `%d' ismarışı yenidən yollamaq istəyirsən?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Heç İsmarış Seçilmədi"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Faylının üsütünə yazım mı?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "İsmarışları Fərqli Qeyd Et..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonrakı oxunamış ismarışı göstər"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11803,7 +12063,7 @@ msgstr ""
 "\n"
 "İsmarışları həqiqətən də silək?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11812,28 +12072,28 @@ msgstr ""
 "Süzgəc məlumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Süzgəclər"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%d İsmarışın %d qədərə alınır"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "İsmarıların çap edilməsi bacarılmadı"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Bütün %d ismarışlarını başqa pəncərədə açmaq istəyirsiniz?"
@@ -11854,7 +12114,7 @@ msgstr "izah"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Adsız Əlaqə"
@@ -11875,20 +12135,21 @@ msgid "Add Signature"
 msgstr "Imzanı qeyd et"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Lütfən, adınızı və ePoçt ünvanınızı aşağıya yazın. \"Arzuya bağlı\" "
 "sahələrin doldurulmağa çox ehtiyacı yoxdur. Əlbətdə yolladığınız məktublarda "
 "bu məlumatların görünməyini istəmirsinizsə."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Lütfən, gələn ePoçt vericisi üçün bilgi verin. Əgər əmin deyilsinizsə, "
 "sistem idarəçinizə, ya da İnternet Xidmət\n"
@@ -11899,24 +12160,23 @@ msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Lütfən, gedən ePoçt vericisi haqqında məlumatları girin. Əgər əmin "
 "deyilsinizsə, sistem idarəçinizə, ya da\n"
 "İnternet Xidmət Vericinizə müraciət edinu."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Məktub quraşdırma əməliyyatı hardasa qurtardı. Bildirdiyiniz şəxsiyyət, "
 "gələn məktub vericisi və\n"
@@ -11926,43 +12186,20 @@ msgstr ""
 "Bu ad təkcə ekranda göstərilmək məqsədilə işlədiləcəkdir."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Yardımçısı"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "İşləyir"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Toqo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "sonra"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesab"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Xidmət Yoxlanılır"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlantı qurulur..."
 
@@ -12227,241 +12464,229 @@ msgstr "Qeyd Et və Qapat"
 msgid "Loading Images"
 msgstr "_Rəsmləri Yüklə"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Məktub qutusu yeri"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "İsmarış Başlığı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneziya"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Vericisi:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "ePoçt Quraşdırılması"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Xəbərlər"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Arzuya Bağlı Məlumatlar"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Açar ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Rəng al"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Təkcə _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Seçili əlaqələri çap et"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail cərgəsi "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Bu parolu _yadda saxla"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Cavab ver"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "ePoçt Alınır"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Alma Seçənəkləri"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Bu parolu yadda saxla"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "İstənən Məlumatlar"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Əsas"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Etibarlı MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP binarını seç"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "ePoçt Göndərilir"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Göndərilən və Lahiyə İsmarışları"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmaya ehtiyac hiss edər"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Verici Quraşdırılması"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Qısa Yollar"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Imzanı qeyd et"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Qaynaq"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Mənbə Məlumatı"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tərz adı :"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX poçt qutusu faylı"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12471,205 +12696,201 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Şərq"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Həmişə netdə olmayan rəsmləri yüklə"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bu hesabı işlədərək göndərdiyin bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Kimlik Yo_xlama Növü: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Yeni Məktubları _avtomatik yoxla"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Vəsiqə ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Qovluq açılırkən Təsdiqlə"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Əsas"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Fəallaşdır"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Fərqli Çatdır"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tam Ad:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML məktubda"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "Yollayan ünvan dəftərində varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Bunu ə_sas hesab olaraq göstər"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İsmarışları bundan sonra \"Oxundu\" olaraq _işarələ: "
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Netdə olmayan rəsmləri he_ç bir vaxt yükləmə"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP binarı cığırı:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Əlaqələrə HTML məktubları göndərəndə bu tərzu istəməyənlər varsa xəbər ver"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzu qisimli məktub göndərdiyim vaxt bildir"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "E-poçt Alınır"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Hamısına cavab ver"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "E-poçt Göndərilir"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vaxt Fərqli Göstər"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML Imza:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "E_tibarlı bağlantı (SSL) işlət"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Dəyişən"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_hər"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " rəng"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "izah"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "xəbərlərpəncərəsi1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12693,204 +12914,214 @@ msgstr "S/MIME zərf məzmunu yaradıla bilmir."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kod açma məzmunu yaradıla bilmir."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Diskə Qeyd Et ..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Yapışdırılmış Faylı Qeyd Et"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "İçərisini Göstər"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "%s da(də) Aç ..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İçərisini Göstər (%s ilə)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Gizlə"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Xarici Göstərici"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Rəsmləri Yüklə"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "İsmarış içindəkilər yüklənir"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Ge_cikmiş işlər:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Körpü Ünvanınə Köçür"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Körpünü Fərqli qeyd et"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Rəsmi Fərqli qeyd et..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s yapışdırılmış fayl"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ismarışı açıla bilmədi: Mənbə kodu gösteriliyor."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Səhv Ünvan"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Göndərən"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Cavablama"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Gn:"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Göndərici:  "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "İsmarışı Fərqli Qeyd Et..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Bu ismarış digital olaraq imzalanmışdır. Ətraflı məlumat üçün qıfıl "
 "timsalına tıqla."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP təsdiq məzmunu yaradıla bilmir."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ismarış digital olaraq imzalanmışdır və original olduğu düşünülür."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Bu ismarış digital olaraq imzalanmışdır amma original olduğu düşünülmür."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP saytını göstərən ox (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Yerli faylyi göstərən (%s) oxu \"%s\" saytında hökmlüdür"
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerli faylyi göstərən ox (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Uzaq verilənlər (%s) nişanı"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Naməlum xarici məlumatı göstərən ox (\"%s\" növündə "
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Qovluq yenidən qurulur"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Qovluğun meta məlumatını qeyd eda bilmədim; Bu qovluğu bir də aça\n"
 "bilməyə bilərsən: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üstündə meta verilənlər qeyd edilə bilmir: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Qovluq meta verilənləri %s silinə bilmir: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" qovluğu \"%s\" şəklinə çevrilir"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s yerli qovluq olmadığı üçün yenidən sazlana bilməz"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12898,16 +13129,16 @@ msgstr ""
 "Bu qovluğu bir də aça bilməsən, onu əllə\n"
 "bərpa etməlisən."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Yerli olmayan qovluqların şəklini dəyişdirə bilməzsiniz."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "%s i(ı) Yenidən Quraşdır"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12916,7 +13147,7 @@ msgstr ""
 "'%s' sırasında xəta:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12925,7 +13156,7 @@ msgstr ""
 "Əməliyyat aparılırkən xəta oldu:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "İşləyir"
 
@@ -12933,100 +13164,100 @@ msgstr "İşləyir"
 msgid "Filtering Folder"
 msgstr "Qovluq Süzülür"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Axırı ki, ismarış müvəffəqiyyətlə yollandı."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" Göndərilir"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d ismarışda xəta"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Qurtadı."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) daşınır"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar \"%s\"a(ə) köçürülür"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" dakı qovluqlar daranır"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "%s qaynağı açılır"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Qovluq açılır"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d ismarış alınır"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13035,7 +13266,7 @@ msgstr ""
 "Nəticə faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13044,11 +13275,11 @@ msgstr ""
 "İsmarışların buraya qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Yapışdırılmış Fayl Qeyd Edilir"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13057,27 +13288,22 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Data yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "A_xtar"
 
@@ -13132,32 +13358,41 @@ msgstr "Cığır: %s, Növ: %s"
 msgid "Type: %s"
 msgstr "Növ: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Poçt Göndər və Al"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Hamısını Ləğv Et"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Güncəllənir ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Bu parolu _yadda saxla"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Bu iclas boyunca bu parolu yadda saxla"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün Parol girin"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Parol Girin"
 
@@ -13184,7 +13419,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Ad :"
 
@@ -13214,7 +13449,7 @@ msgstr "Çatdırılmış ismarış - %s"
 msgid "Forwarded message"
 msgstr "Çatdırılmış ismarış"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Çatdırılmış İsmarış"
 
@@ -13228,7 +13463,7 @@ msgstr "vfolder qurulur: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Uri üçün vfolder məlumatı güncəllənir: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13241,95 +13476,98 @@ msgstr ""
 "    '%s'\n"
 "Və güncəlləndilər."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFolderlər"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Qovluqlar"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "VFolder-i Düzəlt"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Mövcud olmayan '%s' vfolder-i düzəldilməyə çalışılır."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Yeni VFolder"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Mövzusuz)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İsmarış"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Cavab cerilmiş"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Alçalt"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Yüksək"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Sabah: %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -13364,47 +13602,47 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Geri axtarma"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "İrəli get"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Mənbə Məlumatı"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Çatdır"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Cavab ver"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Hamısına cavab ver"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Nümayiş"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13428,16 +13666,16 @@ msgstr "\"%s\" qovluğuna qeydiyyat aparılır"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" qovluğuna qeydiyyat silinir"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Qovluq"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Heç verici seçilməyib"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Verici seçin."
 
@@ -18360,11 +18598,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24380,8 +24618,8 @@ msgstr "izah"
 msgid "Mail summary"
 msgstr "Poçt icmalı"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
@@ -24399,15 +24637,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Günün Sitatları"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Xəbər əlavə et"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Əlavə etmək istədiyiniz xəbərlərin URL-sini girin"
 
@@ -24419,26 +24657,26 @@ msgstr "RDF endirmə xətası"
 msgid "News Feed"
 msgstr "Yeni Bəsləmə"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Ə_lavə Et"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Yağış"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Vəzifə yoxdur"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(İzahsız)"
 
@@ -25715,7 +25953,8 @@ msgid "Tasks "
 msgstr "Vəzifələr"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Hava qurğuları"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25772,7 +26011,7 @@ msgstr "Təfsilatı Göstər"
 msgid "Cancel Operation"
 msgstr "Əməliyyatı Ləğv Et"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25786,21 +26025,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Qovluq Seçin"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Lahiyə"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Gedənlər qutusu"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Görülmüş"
@@ -26035,22 +26274,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "\"Evolution\" - Yeni qovluq yarat"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Bildirilən gediş üçün bu seçili qovluq növü \n"
-"hökmlü deyildir ."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Yeni _Qovluq Yarat..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "( Adsız )"
 
@@ -26072,7 +26304,7 @@ msgstr ""
 "Əgər təsəvvürünüz yoxdursa \"Avtomatik\" seçənəyini seçin, \"Evolution\" özü "
 "bildiyi kimi edər."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Xahiş edirik, idxal edəcəyiniz məlumatı seçin:"
 
@@ -26103,22 +26335,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Qovluq Seçin"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı yoxdur"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Təkcə yerli qovluqlara idxal edə bilərisiniz"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26127,11 +26355,11 @@ msgstr ""
 "İş görəcək alıcı mövcud deyildir\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Alınır"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26140,17 +26368,17 @@ msgstr ""
 "%s Alınır.\n"
 "%s Başladılır"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başladırkən xəta oldu"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklənərkən xəta oldu"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26159,31 +26387,31 @@ msgstr ""
 "%s Alınır\n"
 "Alınan üzv 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Fayl seç"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Köhnə proqramlardakı verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26191,24 +26419,24 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Bu verilənin idxal ediləcəyi hədəf qovluğu seçin"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Al"
 
@@ -26256,9 +26484,14 @@ msgstr "%s qovluğu açılır"
 msgid "in \"%s\" ..."
 msgstr "%s da(də) Aç ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Qovluq yenidən adlandırıla bilmir: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Bildirilən qovluq yaradıla bilmədi:\n"
 "%s"
@@ -26276,8 +26509,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionun ePoçt Yardımçısı ara üzü başladıla bilmir\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Yeni"
@@ -26318,56 +26551,57 @@ msgstr "Qovluğa get ..."
 msgid "Select the folder that you want to open"
 msgstr "Açmaq istədiyiniz qovluğu seçin"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Yeni bir qısa yol yarat"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Qısa yolun nişanlayacağı qovluğu seçin:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "( Heç bir qovluq göstərilmir )"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Heç Biri)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution xətdən çıxmaq gedişatındadır."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26379,12 +26613,12 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerli qeydi quraşdıra bilmədim -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26395,31 +26629,31 @@ msgstr ""
 "şəkildə öldü. Evolution proqramından çıxıb yenidən başlatmalısınız ki,\n"
 "verilənlərə yenidən çata biləsiniz."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edə bilmirəm"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Databeyzi Tapılmadı"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Qrup adı :"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26428,107 +26662,117 @@ msgstr ""
 "`%s' Qrupunu qısa yol çubuğundan həqiqətən \n"
 "də silmək istəyisiniz?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Silmə"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Qısa Yol Qrupunu Yenidən Adlandır"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili qısa yol qrupunu belə adlandır:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Kiçik Timsallar"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Qısa yolları kiçik timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Böyük Timsallar"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Qısa yolları böyük timsallar olaraq göstər"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Yeni Qrup..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Yeni bir qısa yol qrupu yarat"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Bu Qrupu _Sil..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Bu qısa yol qrupunusil"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Bu Qrupu _Yenidən Adlandır..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Bu qısa yol qrupunu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Qısa yol Çubuğunu _Gizlə"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Qısa yol Çubuğunu Gizlə"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Yeni bir qısa yol yarat"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Yeni bir qısa yol yarat"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Bu qısa yolun adını belə dəyişdir:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu qısa yola körpülənmiş qovluğu aç"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Yeni _Pəncərədə Aç"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Bu qısa yol ilə niçanlanan qovluğu yeni pəncərədə göstər"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "Yeni_dən Adlandır"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Bu qısa yolu yenidən adlandır"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Sil"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu qısa yolu qısa yol çubuğundan sil"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Qısa yolları qeyd edərkən xəta oldu."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Qısa Yollar"
 
@@ -26536,55 +26780,55 @@ msgstr "Qısa Yollar"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Xəta yoxdur"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Eyni adlı bir qovluq onsuz da var"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Bildirilən qovluq növü hökmlü deyildir"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "G/Ç xətası"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Qovluğu yaratmaq üçün lazımi disk sahəsi yoxdur"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Qovluq boş deyil"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Bildirilən qovluq tapıla bilmədi"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funksiya yazılmamışdır"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Əməliyyat dəstəklənmir"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Bu qeydlərdə müəyyənləşdirilən növ dəstəklənmir"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Bildirilən qovluq təkmilləşdirilə, silinə bilməz"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Altlarından birinə törəmə qovluq yarada bilmirəm"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Bu adda qovluq yarada bilmədim"
 
@@ -26639,63 +26883,63 @@ msgstr ""
 "Fəallaşdırma sistemi xətası:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA xətası"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Kəsilmiş"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Səhv qrqument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Onsuz da yiyəsi var"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Yiyəsi yoxdur"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Tapıla bilmədi"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Dəstəklənməyən növ"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Dəstəklənməyən sxem"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Dəstəklənməyən gedişat"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Daxili xəta"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Mövcuddur"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Hökmsüz URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Alt qovluqları var"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Heç yer qalmayıb"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Köhnə yiyəsi öldü"
 
@@ -26720,6 +26964,26 @@ msgstr "Qovşaq"
 msgid "The following connections are currently active:"
 msgstr "Aıağıdakı bağlantılar onsuz da fəaldır:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Təqvim"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Əlaqələr:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Məktub"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Vəzifə"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Qovluq adı:"
@@ -26732,6 +26996,34 @@ msgstr "Qovluq növü:"
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri göstərin:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Yeni _Qovluq Yarat..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Qovluq adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Verici adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "İ_stifadəci Adı:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Sazlama Yardımçısı"
@@ -26827,15 +27119,15 @@ msgstr "Mənə bir də soruşma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri ala bilər:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution əndə çıxır..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26855,53 +27147,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution _FAQ"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Mənə bir də soruşma"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution qabığına çata bilmədim."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution qabığını başlada bilmədim: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Açılış ekranını gösdərmə"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "İdxal başlanır"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün xəta ayıqlama verilənlərini bir fayla yazdır."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemini başlada bilmədim."
 
@@ -26938,116 +27230,110 @@ msgstr "Seçiləni köçürt"
 msgid "Copy to Folder..."
 msgstr "Qovluğa _Köçürt..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Yeni bir hesab yarat"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Yeni bir əlaqə siyahısı yarat"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Seçiləni kəs"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Seçili əlaqəni sil"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Seçili ismarışları başqa bir cərgəyə daşı"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Ara yaddaşı yapışdır"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Çap ediləcək əlaqəni nümayiş etdirər"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Çap Etmə Nüma_yişi"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Seçili əlaqələri çap et"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Seçili əlaqələri VCard olaraq qeyd et."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Hamısını Seç"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Bütün əlaqələri seç"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Seçili ismarışı başqa əlaqələrə yolla."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Əlaqəyə yeni bir ismarış göndər"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Seçili əlaqələri başqasına göndər."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Dayan"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Yükləməni Dayandır"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "indiki vaxt"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Gedişlər"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Əlaqə Siyahısı"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Əlaqənı _Çatdır..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Qovluğa _Daşı ..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "VCard olaraq _Qeyd Et"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Əlaqələri A_xtar"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Hamısını Se_ç"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "_İsmarışı Əlaqəyə Göndər..."
@@ -27092,11 +27378,6 @@ msgstr "Ay"
 msgid "Previews the calendar to be printed"
 msgstr "Çap ediləcək təqvimi nümayiş etdirər"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Çap Etmə Nüma_yişi"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Bu təqvimi çap et"
@@ -27129,7 +27410,7 @@ msgstr "Həftə"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Qapat"
 
@@ -27142,7 +27423,7 @@ msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Ana vasitə çubuğu"
 
@@ -27154,8 +27435,8 @@ msgstr "Çap ediləcək üzvü nümayiş etdir"
 msgid "Print this item"
 msgstr "Bu üzvü çap et"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Qeyd Et"
 
@@ -27180,9 +27461,9 @@ msgstr "Bu üzvü diskə qeyd et"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fayl"
 
@@ -27192,7 +27473,7 @@ msgstr "_Zərfi Çap Et..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Fərqli Qeyd Et ..."
 
@@ -27207,8 +27488,8 @@ msgstr "_İsmarışı Əlaqəyə Göndər..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Qeyd Et ..."
 
@@ -27305,26 +27586,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Bütün seçili ismarışları bütün qovluqlardan tamamilə sil"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "_Yeni İsmarış Yaz"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "İsmarışlar qovluğa qeyd edilir"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "İsmarış nümayiş pəncərəsini göster"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzaq vericilərdəki qovluqlara qeydiyyatdan keç ya da qeydiyyatdan çıx"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Virtual Qovluq _Düzəldicisi..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Süzgəclər ..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Nümayiş Paneli"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Qovluqlara Qe_ydiyyatdan Keç..."
 
@@ -27422,7 +27713,7 @@ msgstr "İlgək_lənmiş İsmarışlar Siyahısı"
 msgid "_Expunge"
 msgstr "_Təmizlə"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Qovluq"
 
@@ -27682,181 +27973,196 @@ msgstr "Əvvəlki Oxunmamış İsmarış"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Vəzifə Cavabı"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Bütün qovluqlarda yeni ePoçt üçün bax"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Əvvəlki Vacib İsmarış"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Çap ediləcək ismarışı nümayiş etdir"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Əvvəlki"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "İsmarışı çap et"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili ismarışı birinə çatdır"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Mətni əsl böyüklüyünə sıfırla"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "İsmarışı A_xtar..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Daha Ki_çik"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "İsmarışı mətn faylı olaraq göstər"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Göstərilən ismarışın vücudunda mətn axtar"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Səhifə qurğularını hazırkı çap edicinizə göra uyğunlaşdırın"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Məktub _Mənbəyini Göstər"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "_Tam Başlıqları Göstər"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "İsmarışı normal tərzdə göstər"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "İsmarışı bütün başlıqlarla göstər"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "İsmarışın mənbəyini göstər"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Mətn Bö_yüklüyü"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Seçili ismarışı silmə"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Məktublaşma Q_rupundakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Gön_dərəndəki VFolder..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcıdakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "_Mövzudakı VFolder..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Yapışdır"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçürt"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "İsmarışı Çat_dır"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Get"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Daxili"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Daha _Enli"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_İsmarış Ekranı"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Sonrakı İsmarış"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal Ekran"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "İsmarışı _Aç"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Əvvəlki İsmarış"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Adını Dəyişdir..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Vasitələr"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Bu pəncərəni qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Qapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Göstər"
 
@@ -27884,169 +28190,161 @@ msgstr "Bu ismarışı S/MIME Vəsiqəniz ilə kriptləyin"
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Daxili _Mətn Faylı..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Bir faylı mətn olaraq ismarışa əlavə et"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "_Mətn faylını daxil et ... "
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Aç"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Fayl aç"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP kodla"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP İmzası"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME Kodla"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME İmzası"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Fərqli Qeyd Et"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "_Lahiyəni Qeyd Et"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "_Qovluqda qeyd et ..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Hazırkı faylı qeyd et"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Hazırkı faylı fərqli bir ad altında qeyd et"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "İsmarışı bildirilən qovluqda qeyd et"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Göndər"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "_Sonra Göndər"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "_Sonra göndər"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "ePoçtu HTML Şəklində göndər"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "İsmarışı sonra göndər"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Bu ismarışı indi göndər"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Yapşdırılmış faylları göstər/gizlət"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "_Yapışdırılmış Faylları göstər"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Yapışdırılmış faylları göstər"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "İsmarışı fərqli bir ad altında qeyd et"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "İsmarışı S/MIME İmza Vəsiqənizlə imzala"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "GÖNDƏRƏN girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "GÖNDƏRİLƏCƏK girişinin harda olacağını bildirər"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_İlişdirilmiş..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc Girişi"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc Girişi"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "Hamısını _Sil"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Göndərən Girişi"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Daxil Et"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Aç ..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Cavab_Verləcək Girişi"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Üzvü qeyd et və dialoqu qapat"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Kömək"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Imzanı qeyd et"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Qovluğu qeydiyyatlı qovluqlar siyahısına al"
@@ -28144,171 +28442,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "_Qısa Yol Çubuğuna Əlavə Et"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution Alarmı"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Bu qovluğun adını dəyişdir"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Bu qovluğu köçürt"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Yeni _Qovluq Yarat..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Bu qovluğa qısa yol çubuğunda bir köpü yarat"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Yeni qovluq yarat"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Yeni bir qısa yol yarat"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Yeni qovluq yarat"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Bu qovluğu sil"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Başqa bir qovluğu göstər"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Çı_x"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _Pəncərəsi"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Proqramdan çıx"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Başqa proqramlardakı verilənləri idxal et"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Bu qovluğu başqa yerə daşı"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Yeni _Qovluq Yarat..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Bu qovluğu yeni pəncərədə aç"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot Qurğuları..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Al / Göndər"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sorğulanmış məktubu göndər və yeni məktubları al"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "ePoçt Quraşdırılması"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution haqqında məlumat göstər"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportunu Göndər"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug-buddy ilə bir xəta raportunu göndər"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Gizlə/Göstər"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Qovluqlar çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyi yeri bildir"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Oflayn işləmənin harda olacağını bildirər"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Seçili qovluğu göstər"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Haqqında..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Köçürt..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Qovluq Çubuğu"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Qovluq"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Qovluğa _Get ..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Daşı ..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Yeni Qovluq"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot Qurğuları..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Təkrarlama _yoxudr"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Adını Dəyişdir..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Qısa Yol"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Qısa Yol Çubuğu"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Qısa Yol"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "İcmalı çap et"
@@ -28322,17 +28651,40 @@ msgid "Reload the view"
 msgstr "Nümayişi yenilə"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Ünvan Kartları"
+#, fuzzy
+msgid "By _Company"
+msgstr "Şirkət"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Şirkət"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Ünvan Kartları"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefon Siyahısı"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Həftəlik Nümayiş"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Gündəlik Nümayiş"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Aylıq Nümayiş"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "İş Həftəsi Nümayişi"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28358,13 +28710,19 @@ msgstr "Mövzu"
 msgid "Messages"
 msgstr "İsmarışlar"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Kateqoriya ilə"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Vəzifə"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28518,11 +28876,11 @@ msgstr "Hərf Kodlaması"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Axtarış Editoru"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Axtarışı Qeyd Et"
 
@@ -28562,21 +28920,21 @@ msgstr "İsmarış"
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "İndi Axtar"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Təmizlə"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "İndi Axtar"
 
@@ -28590,18 +28948,163 @@ msgstr "Şəxsi Ünvan Dəftəri Vericisi"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Şəxsi Ünvan Dəftəri Vericisi; təqvim emalatxanası"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME_VFS başladıla bilmədi"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME başladıla bilmədi"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution ünvan dəftərinin yerli daxılını əldə edə bilmir.\n"
+#~ "Bu, evolution-addressbook qisminin çökməsindən ötrü ola bilər.\n"
+#~ "Bizə problemi anlamqda yardımçı olmaq üçün xahiş edirik,\n"
+#~ "Jon Trowbridge <trow@ximian.com> ünvanına ətraflı xəta raportu\n"
+#~ "göndərəsiniz. Minnətdarıq."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution ünvan dəftərinin yerli daxılını əldə edə bilmir.\n"
+#~ "Normal hallarda bu, heç bir vaxt olmamalıdır.\n"
+#~ "Problemi həll etmək üçün Evolution proqramının\n"
+#~ "yenidən başladılması lazım gələ bilər."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Daşı ..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Görüş vəziyyəti dəyişdi. Güncəllənmiş nüsxəsini yollayaq?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Bu İclası _Sil"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Məruzəçi: %s\n"
+#~ "Mövzu: %s"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "G/Ç xətası"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Xoş gəldin ismarışı cavab xətası: %s: ağır deyil dəyəsən"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO istək vaxtı doldu: %s: ağır deyil"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO cavablama xətası: %s. ağır deyil"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUİT istək vaxt dolması: %s: ağır xəta"
+
+#~ msgid "Insert File"
+#~ msgstr "Faylı Daxil Et"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Vaxsey. Hökmsüz tarixi seçmisən."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Bu ismarış tarixi süzgəcin işlədiyi və ya\n"
+#~ "vfolderin açıq qaldığı müddət ilə müqayisə\n"
+#~ "ediləcəkdir."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution Xəbər Düzəldicisi"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Bu xəbər hesabını həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Bu ePoçtu göndərməkdən əvvəl bir ePoçt\n"
+#~ "hesabını quraşdırmalısan."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Vericisi:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Xəbərlər"
+
+#~ msgid "Source"
+#~ msgstr "Qaynaq"
+
+#~ msgid "Source Information"
+#~ msgstr "Mənbə Məlumatı"
+
+#~ msgid "newswindow1"
+#~ msgstr "xəbərlərpəncərəsi1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Diskə Qeyd Et ..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "İsmarışı Fərqli Qeyd Et..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "\"Evolution\" - Yeni qovluq yarat"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Bildirilən gediş üçün bu seçili qovluq növü \n"
+#~ "hökmlü deyildir ."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Təkcə yerli qovluqlara idxal edə bilərisiniz"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Əlaqə Siyahısı"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Daxili _Mətn Faylı..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Bir faylı mətn olaraq ismarışa əlavə et"
+
+#~ msgid "Insert text file..."
+#~ msgstr "_Mətn faylını daxil et ... "
+
+#~ msgid "Send _Later"
+#~ msgstr "_Sonra Göndər"
+
+#~ msgid "Send _later"
+#~ msgstr "_Sonra göndər"
+
+#~ msgid "Send the message later"
+#~ msgstr "İsmarışı sonra göndər"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot Qurğuları..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Ünvan Dəftəri Qaynağı"
@@ -28728,10 +29231,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgstr "Tuvalu"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Imza faylı : "
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "İmza xaricindəkiləri sil"
 
@@ -29093,12 +29592,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldova Respublikası"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Yeni bir iclas yarat"
-
-#~ msgid "Create a new task"
-#~ msgstr "Yeni bir vəzifə yarat"
-
 #~ msgid "New _Task"
 #~ msgstr "Yeni _Vəzifə"
 
@@ -29192,9 +29685,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ "Bu seçənək POP verisici ilə Kerberos 4 istifadə edərək ünsiyyət "
 #~ "quracaqdır."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "KPOP vericisi ilə ünsüyyət qurula bilmir: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Vericiyə bağlana bilmirəm: %s"
 
@@ -29235,9 +29725,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Məktub saxlama qovluğu (daxili)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Ambara bağlana bilmirəm: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Yeni _Məktub İsmarışı"
 
@@ -29281,9 +29768,6 @@ msgstr "init_bonobo(): Bonobonu başlada bilmədim"
 #~ msgid "_Organization:"
 #~ msgstr "_Qutuluş:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Bu parolu _yadda saxla"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Əsas olaraq Məktubu HTML Şəklində _göndər"
 
diff --git a/po/bg.po b/po/bg.po
index 3c509c73b2..6c9db7a7dc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0RC2\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-04-30 11:47GMT\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "����� VCard ������� � ��������."
 msgid "File As"
 msgstr "���� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
@@ -343,46 +343,46 @@ msgstr "VCard �� %s"
 msgid "Could not initialize Bonobo"
 msgstr "�� ���� �� ������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "�����..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "��������"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "������ � ������� �� �����."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "����� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "������� �������� � LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "������ ������ ���������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� �� �������� �� LDAP �������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "�� ���� �� ���������� URL `%s'"
@@ -476,11 +476,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "��������"
 
@@ -496,23 +496,32 @@ msgstr "LDAP ������"
 msgid "LDAP server containing contact information"
 msgstr "LDAP ������ �������� ���������� �� �������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "��� �������"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_�������"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "������ ��� �������"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "��� ������ � ��������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "������ _��������"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "��� �������"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_�������"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "������ ��� ������ � �������"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -535,30 +544,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������� �� ������� %s ����������"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL �� �� ������� � ���� ������ �� evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ���� �� ������������� gnome-vfs"
 
@@ -566,11 +575,11 @@ msgstr "�� ���� �� ������������� gnome-vfs"
 msgid "Other Contacts"
 msgstr "����� ��������"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�� ���� �� ������ ��������� �����"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -580,7 +589,7 @@ msgstr ""
 "������ ������� URI, ��� LDAP ������� �� ������.\n"
 " "
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -592,7 +601,7 @@ msgstr ""
 "���������� �� CVS ���� ���� ��� ��������� � ����������� \n"
 "OpenLDAP �� ������������� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -600,44 +609,44 @@ msgstr ""
 "�� ���� �� ������ ���� ������� �����. ���������\n"
 "���� ���� ���������� � ���� ����� ����� �� ������."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ �� %s (���������� %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� �"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "��. ���� 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "����������� �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "��� �� � ���� �������"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "������������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "��� �� � ���������"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -759,7 +768,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "��������� �� ������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -853,8 +862,8 @@ msgstr "������������"
 msgid "Mappings"
 msgstr "������"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_�����"
@@ -906,8 +915,8 @@ msgstr "������ �� ���������: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "�����"
 
@@ -1098,15 +1107,15 @@ msgid "Using email address"
 msgstr "���� � �����_��� �����"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "���_���"
 
@@ -1152,12 +1161,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_����������"
@@ -1272,10 +1281,10 @@ msgstr "������� �� ��������� �� ����� � ��������� ����� �� ��������"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "��������"
 
@@ -1304,39 +1313,15 @@ msgstr "(%d �� �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "����� �� ������� �� ��������� �����"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "��������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution �� � � ��������� �� ������ ��������� ����� �� ������� ���������.\n"
-"���� ���� �� ���� ������ ��������� �� evolution �� ��������� ����� �� "
-"������.\n"
-"�� �� �� ��������� ��-����� �� �������� � ����� ��������,\n"
-"���� ��������� ���� �� <trow@ximian.com> � �������� ����������\n"
-"���������� ��."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "����� �� ������� �� ��������� �����"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "����� �� �����"
@@ -1358,15 +1343,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "��������..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "�_��������:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "���_��:"
 
@@ -1469,11 +1449,12 @@ msgstr "����� �� ��������� _HTML mail"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "������"
 
@@ -2713,7 +2694,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_������ �������� ������ ������� ���� �� ���� ������"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "�����"
 
@@ -2776,7 +2757,7 @@ msgstr ""
 "���������� � �������. ������ �� �� �� �������� ������� ����?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "������������ �������"
 
@@ -2804,21 +2785,21 @@ msgid "Error getting book view"
 msgstr "������ ��� ���������� �� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ��� ������������ �� �����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "���������� ������"
 
@@ -2826,8 +2807,8 @@ msgstr "���������� ������"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "������� ������"
 
@@ -2844,7 +2825,7 @@ msgid "Protocol not supported"
 msgstr "��������� �� �� �������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2867,48 +2848,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "������ `%s' �� ����������."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "����� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� �� ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "������ ��� �������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "������ ��� �������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "������ ��� ������������ �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "������ ��� ��������� �� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��� ��������� �� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2916,22 +2902,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "�������� ��������(���/���) �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "���� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "���� �����"
@@ -3004,7 +2990,7 @@ msgstr "������� �����"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "������� ���� VCard"
 
@@ -3044,7 +3030,7 @@ msgid "Pilot Settings..."
 msgstr "��������� �� Pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�������� �������"
 
@@ -3053,8 +3039,8 @@ msgid "Send Message to Contact"
 msgstr "������� ����������� �� �������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "���������"
@@ -3074,7 +3060,7 @@ msgid "Move to folder..."
 msgstr "�������� � �����..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "������"
 
@@ -3085,20 +3071,20 @@ msgid "Copy"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_����� �������"
@@ -3267,7 +3253,7 @@ msgstr "������"
 msgid "Number of columns:"
 msgstr "���� ������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "�����"
 
@@ -3357,26 +3343,26 @@ msgstr "���������� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "������"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "�����"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "������������"
@@ -3497,11 +3483,11 @@ msgstr "����� �� �������� (������)"
 msgid "_Edit appointment"
 msgstr "_���������� �����"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "���� ��������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3512,13 +3498,13 @@ msgstr ""
 "�� ��. ���� ��� ���, �� ���� ��������� � �������������\n"
 "�� ������� ����."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3529,7 +3515,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� �������� ���� ��������� ������."
@@ -3558,7 +3544,7 @@ msgstr "���������� �� ��������"
 msgid "Comment contains"
 msgstr "���������� �� ��������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "����������"
 
@@ -3569,7 +3555,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3591,19 +3577,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�� ���� �� ������ ���������� ������. ���� ��������� ����������� �� ORBit � "
 "OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��������������"
@@ -3628,37 +3614,37 @@ msgstr "�"
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� � ���������"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� �������"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3669,56 +3655,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "_������ �� ���"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "������ �� ������� �������"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "������ �� �������"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "����� �� �����"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "��������"
 
@@ -3726,12 +3711,12 @@ msgstr "��������"
 msgid "Folder containing appointments and events"
 msgstr "������� ������� ����� � �������"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
 
@@ -3739,44 +3724,62 @@ msgstr "������"
 msgid "Folder containing to-do items"
 msgstr "������� ������� ������ �� �������"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "���� �����"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "�����"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "������� ���� ����"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� �� �������� �� ������"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "�����"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "������� ���� ������"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "���� ������"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_������"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "������� ���� ������"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "���� �����"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "���� �����"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "�����"
+msgid "Create a new all-day appointment"
+msgstr "������� ���� ����"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3841,7 +3844,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "� ���� ���������:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "���"
 
@@ -3849,11 +3853,13 @@ msgstr "���"
 msgid "extra times every"
 msgstr "������������ ����� �����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "������"
 
@@ -3981,7 +3987,7 @@ msgstr "���������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4010,7 +4016,7 @@ msgstr "���� �� �����"
 msgid "hour(s)"
 msgstr "���(���)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "�����(�/�)"
 
@@ -4188,7 +4194,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_�������"
 
@@ -4233,19 +4239,33 @@ msgstr "_��"
 msgid "before every appointment"
 msgstr "���� �������� �� �������"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "������� �� ������� � ��������. �� ������� ���������� ������?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "������� �� ���, �� ������ �� ���������� � �������� ���� �����?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "������� �� ���, �� ������ �� ���������� � �������� ���� ������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "������� �� ���, �� ������ �� ���������� � �������� ���� ����� � ��������?"
@@ -4314,61 +4334,61 @@ msgstr " (������"
 msgid "Due "
 msgstr "������"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�� ���� �� ������ ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "����������� �� �����"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "����� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "����� � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "���� ������"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "�� ���� �� ������ �������� ������!"
 
@@ -4568,7 +4588,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4580,7 +4600,7 @@ msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "������"
@@ -4665,7 +4685,7 @@ msgstr "��"
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "�������"
 
@@ -4689,7 +4709,7 @@ msgstr "������"
 msgid "Other Date"
 msgstr "���� ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "���"
 
@@ -4789,20 +4809,26 @@ msgstr "% ����������"
 msgid "Date Completed:"
 msgstr "���� �� �����������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "���������� ��������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_���������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_������:"
 
@@ -4816,7 +4842,7 @@ msgstr "�������"
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4885,80 +4911,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "������� ����..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_�����..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_������� ���� ����������"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "���_����� ���� ������ ���� ���������"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� �� �� �������� ������"
@@ -4967,8 +4993,8 @@ msgstr "�������� �� �� �������� ������"
 msgid "Alarms"
 msgstr "������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "����������"
 
@@ -4996,11 +5022,9 @@ msgstr "���������"
 msgid "Start Date"
 msgstr "������� ����"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "������"
 
@@ -5042,110 +5066,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "���� _�����"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "������ ���� _������� �� ����"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "�����"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "���� ������"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�����..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "����� �� _����"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "����� _�� ����..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_������������� ����������"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "������������"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "������������"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "������ ����..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "���� �� _�����"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� ���� _i��������"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "����� ���� ������� ��_����������"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "������ ���� �_������"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "������ ������ _�������"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "����������� GNOME Pilot �������� �� � ���������� �� ���� �������"
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ��� ���������� �� %s"
@@ -5186,7 +5209,7 @@ msgstr "�������� ����������: <b>"
 msgid "Task Due: <b>"
 msgstr "���������� ������: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "i���������� ����������"
 
@@ -5195,12 +5218,12 @@ msgstr "i���������� ����������"
 msgid "iCalendar Error"
 msgstr "i�������� ������"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "���������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5208,321 +5231,326 @@ msgstr ""
 "<br> ����, ����������� �������� ���������� � ������ �������� �������� �� "
 "������� ����."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>���</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_���������������: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_������:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "������ ��������:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "������� ���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "�������� ������� �� ������������"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "������� ���������� ����������"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ��������� ���������� �� �����."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "���������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ������� ������ ���������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "����������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ����� �� ���� ������� �� �������������� �����."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� �������.."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "������ �� ���������� �� �������:"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �������� �� ��������� �� �������."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �������� �������."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "���������� �� �������"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ������� ������������ ���������."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "���� ��������� �� �����"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ��������� ���������� �� ��������."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ������� ������ ������� � ������.."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "����������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ����� �� ���� ������� ��� ������������ ������.."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ����� �� ������ ���������� ���������� �� ������.."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "������ �� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��������� � ������."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �������� ������."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "���� ��������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ��������� ���������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> ������� �� ��� ���������� �� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "������ ��������/����"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �������� �� �������� ��������/����."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "������� ��������/����"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "���� ��������/���� ���������"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "����������� ������� ���� ����������� ������."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "����������� �� ������� ������� �������� ���������."
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "����������� ���� ������ ������ �� ��������"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "������������ ����������\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "������������ ���� �� ���� �� ���� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "������ ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "������ �� ���� �� ���� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������ �����"
@@ -5568,7 +5596,7 @@ msgstr "������� ����"
 msgid "Chair Persons"
 msgstr "������������������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "�������"
 
@@ -5581,57 +5609,52 @@ msgid "Non-Participants"
 msgstr "�� ���������"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "������������"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "���������"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "������������������"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "������ ��������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "������������ ��������"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "�� ��������"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "���������� ��������"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "���������"
 
@@ -5721,49 +5744,46 @@ msgstr "������ �� �������:"
 msgid "Meeting _end time:"
 msgstr "���� �� �������:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� �� ������ � %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ���� �� ������ ������ � `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "������ ������ �� ��������� �� `%s' �� �� �������"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ���� �� ������ ����� � `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���� �� �����������"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "������ ��������� ������"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "��������� �� �����"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "���� _�����..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_������ ���� �����"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5774,11 +5794,16 @@ msgstr "�� ���� �� ������ ����� � `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "������ ������ �� �������� �� `%s' �� �� �������"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������ �������� � %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�������� �� ����� %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "�����"
@@ -5835,53 +5860,58 @@ msgstr "��������"
 msgid "September"
 msgstr "���������"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "��������� � ���� ���� ��������."
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "������ �� ���� ������� �����������."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "���������� �� ������"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "���������� �� �������"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "���������� ��������/����"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "���������� ����������"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "��� ������ �� ��� ������� �� ���������."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "�� ���� �� ������������� Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "�� ���� �� ������ ������� �� ��������� �� ���������"
 
@@ -6108,9 +6138,8 @@ msgid "Print Calendar"
 msgstr "��������� ��������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "������� �������"
 
@@ -6146,8 +6175,8 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "�� �������� ���� ��������� ������."
 
@@ -6211,17 +6240,29 @@ msgstr "����� VCard ������� � ��������."
 msgid "Imports vCalendar files into Evolution"
 msgstr "����� VCard ������� � ��������."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"�� ���� �� ������ ���������  %s �� ����� %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "�� ���� �� �� ������ ��� ��������� %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "�������"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��������� �� ��������"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6230,112 +6271,112 @@ msgstr ""
 "Evolution ������ �������� ������� �� Pine.\n"
 "������ �� �� �� ����� ����������� � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "��������"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now ������ 0 ���������"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time ������ 1 ��������"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time ������ �������� 1 �� ���� ���"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day ������ 2 ���������"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin ������ 1 ��������"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7932,72 +7973,82 @@ msgstr "��������� �� ����� %s"
 msgid "You must be working online to complete this operation"
 msgstr "��� ������ �� ��� � 'online' �� �� ��������� ���� ��������"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ��� ������ � ������: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ��� ���������� �� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "�� ���� �� ������ spool �����"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "�� ���� �� �������� spool �����"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���������� �� ��������� ����� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "�� ���� �� ������ ���������"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "������ �� ��������� %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "�������������� �� �����"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "������ �� ��������� - %d �� %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "������ ���������"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "������ ���������"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ��� ������� �� ������: %s: %s"
@@ -8053,7 +8104,7 @@ msgstr "�������� ���������"
 msgid "Copying messages"
 msgstr "�������� �� ����������� � %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8061,47 +8112,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "����������."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "��������� ������� �� POP ������: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "���� ��� �� ����"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "�� ���� �� ��������� ���� ���������: ���� ������� ���������"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8109,18 +8160,18 @@ msgid ""
 "%.*s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "������� ��� �������� �� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "������� ��� ���������� �� �����������"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "�� ���� �� ������� �����������: �� ���� �� ������ �������� ����: %s"
@@ -8146,24 +8197,24 @@ msgid "Could not lock '%s'"
 msgstr "�� ���� �� ������� '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ���� �� ������ ��������� ���� �� %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "������ ������� �� ��������� �� ���������� �� ��������� ���� �� %s. ������ "
 "������ ��-�����."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "������� ��� ���������� �� lock ����������� fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "������� ��� ���������� �� lock ����������� flcntl(2): %s"
@@ -8222,11 +8273,15 @@ msgstr "������ ��� ������ �� ���� ��� �������� ���� %s"
 msgid "Error copying mail temp file: %s"
 msgstr "������ ��� �������� �� ���� ��� �������� ����: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8359,7 +8414,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "������ ���������� �������� �������."
 
@@ -8533,31 +8588,134 @@ msgstr "�� ���� �� ����� �������. ������ �������� �� ���� ���������"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ���� �� ������ �������: ������ �������� �� ���� ���������"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "������� ��� �������� �� �����������"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "������� ��� �������� �� �����������"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"������ ���������� �� %s:\n"
-"\n"
-"%s\n"
-"\n"
-"������ �� �� �������� ������� ����?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "���� � ������:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_������������ ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "������ ��� ����������� �� %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "����� �����"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "������� ��� �������� �� �����������"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_������������ ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "������ ��������"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_������������ ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_������������ ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8566,16 +8724,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"������ ���������� �� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"������ �� �� �������� ������� ����?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8595,32 +8770,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "�� ���� �� ���������� URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "������ ��� ���������� �� %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "���� ������ ���������: %s � %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ���� �� ������ ����� %s: ������ ��������"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ���� �� ������ ����� %s: ���� ������ �����"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ���� �� ����������� ������� %s ������ ��������"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
@@ -8628,12 +8808,12 @@ msgstr "�� ���� �� ����������� ������� %s ���� ������ �����"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "���������� ����������"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������� ���������� �� ������: %s"
@@ -8662,40 +8842,40 @@ msgstr "IMAP ������� �� ������� %s ����������"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "��������� OK �� IMAP ������: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ���� �� ������ ���������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ���� �� ������ ��������� �� %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "�������� �� ��������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "����������� �� � �������"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "�������� �������� ���������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "�������� �� ���� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 
@@ -8704,10 +8884,10 @@ msgstr "�� ���� �� ������ ������ �� ����������� � FETCH ��������."
 msgid "Could not open cache directory: %s"
 msgstr "�� ���� �� ������ cache ���������� %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "������� ��� �������� �� ��������� %s: %s"
@@ -8720,7 +8900,7 @@ msgstr "�������� �� ���� ����"
 msgid "Check for new messages in all folders"
 msgstr "������� �� ���� ��������� ��� ������ �����"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "�����"
 
@@ -8750,7 +8930,7 @@ msgstr "�� ������ � ��������� �� ���� �� IMAP �������"
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "������"
 
@@ -8758,73 +8938,77 @@ msgstr "������"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "���� ����� �� �� ������ � IMAP ������ ��������� ����������� ������"
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ������ �� %s �� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "��������� ����������"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "���������� �� �� �������"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "������������ ��������"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "������� �� � ������"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s �� ������� ��������� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "���� �������� �� ���������� ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s���� �������� IMAP �������� �� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "��� �� ��� ������ ������."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8835,31 +9019,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "���� ������ ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "�� �������� ����� �� � ��������� �� ��� ��������"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "�� ���� �� ������ mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8881,7 +9071,10 @@ msgid "Local delivery"
 msgstr "������� ������������"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "�� ���������� �� ������� ���� � ���������� mbox ���������� spools."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8909,12 +9102,12 @@ msgstr "���������� Unix mailbox spools"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "�� ������ � ���������� �� ������� ���� � ���������� mbox spool �������"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8925,38 +9118,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "������� ���������� ���� � inbox"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "������� mail ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ���� �� ����������� ������� %s �� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ���� �� ������ ���� � ��������� �� ����� `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ���� �� ������ �������� ���� �� ����� `%s': %s"
@@ -9016,7 +9209,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9056,26 +9249,26 @@ msgstr ""
 "�� ���� �� �������� �����`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "�� ���� �� ������ mailbox: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "�������� �� ���� ����"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "�������� �� ���� ���������"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "������� �����"
@@ -9119,7 +9312,7 @@ msgstr "������� �������� �� � ������������� ���������."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������������� �� ����������� ��������: �������� mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9128,7 +9321,7 @@ msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9137,14 +9330,14 @@ msgstr ""
 "�� ���� �� ������ ���� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' �� � ��������� ����."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9153,7 +9346,7 @@ msgstr ""
 "�� ���� �� ������ ������� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "������� `%s' �� � ������. �� � �������."
@@ -9168,64 +9361,64 @@ msgstr "�� ���� �� ������ ������� `%s': %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "������� ������ � ������ ����� �� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�� ���� �� ������� ������� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ���� �� ������ ���� `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�� ���� �� ������ ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ���� �� ������� ������� �������� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ���� �� ������� ���������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "����������� � ������� �� �������� ���� ���� �������������"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "���������� ������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�� ���� �� ����������� �������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ��� ������ � ��������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�������� � ��������� mailbox ���������: %s: %s"
@@ -9374,50 +9567,50 @@ msgstr "���������"
 msgid "Operation failed: %s"
 msgstr "���������� ����������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "��������� POP ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "���������� ����������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�� ���� �� ������ �����: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "����� ��������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "���� ��������� � uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� POP ��������� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "�� ���� �� ����� ���������: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "���������� ������"
@@ -9435,7 +9628,7 @@ msgstr "������ ������ �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ���� %s ���"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9460,6 +9653,11 @@ msgstr ""
 "���� ����� �� �� ������ � POP ������ ��������� ���������� ���������� APOP "
 "��������. �������� �� �� ������ �� ������ ����������� �� POP �������."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "�� ���� �� �� ������ ���  %s (���� %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9471,54 +9669,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "�� ���� �� �� ������ ��� POP ������ %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������������ �� ��������� ����������"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ������� ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "������/������� ������"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "�� ���� �� �� ���������� ���� KPOP ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s ���� �������� POP3 ������ �� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP ������.\n"
 "������ ��������� ������ %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���� ������ ����� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9545,35 +9745,35 @@ msgstr "�� ���� �� ������ ��������� ����� �� sendmail: %s: �� � ��������"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�� ���� �� ������� fork sendmail: %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "����������� �� ���� �� ���� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail ������� ��� ������ %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "�� ���� �� ������� %s: ������ �� � ���������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail ������� ��� ������ %d: ������ �� � ���������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "��������� �� ���� ���� ���������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9684,45 +9884,45 @@ msgstr ""
 msgid "Authentication required"
 msgstr "������� �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "�� ���� �� �� ������ � POP �����.\n"
 "������ ��������� ��� �� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "������� �������� �� � ������������� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s �� ������� ��������� ��� ���������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s���� �������� SMTP �������� �� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9733,90 +9933,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP ���� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "�� ���� �� ������� ���������: ��������� ����� �� ���������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "��������� �� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "�� ���� �� ������� ���������: ���� ������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP ������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO �������� �� ������� %s: �� � �������"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO ������ ������� %s: �� � �������"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET ����� ������: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP �������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� ��������� �� SASL ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH �������� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "��� ������� �� ���������� �� �������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �� �������� ������� %s ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM ������ �������  %s: ������ �� � ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9824,90 +10024,90 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "������ ���������� �������� �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH ������ �� �������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET ����� ������: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u �����"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "��������"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� ������ �� ������� �� ���������"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "������ ��������...."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "�������� ���� ��� �����������"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "�� ���� �� ������� ���� %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "�� ���� �� ������� ���� %s: �� � ��������� ����"
@@ -9925,56 +10125,60 @@ msgid "MIME type:"
 msgstr "MIME ���:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "�������� ����������� ��������� �� ��������"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "�������� ��� �� ������� �����"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "��:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "�������-��:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "��:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "��:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "�������� ��������� �� �����������"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ������ �� ���������� �� ������ ����� �� ���� ���������"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9982,17 +10186,25 @@ msgstr ""
 "�������� ������ ����� �� ������ ����� �� ����������� ��� �� �� ������� � "
 "������� �� ������������ �� �����������."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "�����"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "�������� ����"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "�� ���� �� ������ ���������� �������� �� PGP"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10001,34 +10213,34 @@ msgstr ""
 "������ ��� ������ �� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "��������!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "����� ����������. �� �� ���������?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ��� ������������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� ����������� �� ����: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ��� ������ �� ����: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "�� ���� �� ������ ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10037,7 +10249,7 @@ msgstr ""
 "�� ���� �� ������ ��� ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10046,7 +10258,7 @@ msgstr ""
 "�� ���� �� ������ ���� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10055,7 +10267,7 @@ msgstr ""
 "������ ��� ������������� ��������� �� ����: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10063,7 +10275,7 @@ msgstr ""
 "Ximian Evolution ������ ���������� ������� �� ���������� �����.\n"
 "������ �� �� �� ������ �� �� ����������?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10073,57 +10285,53 @@ msgstr ""
 "\n"
 "������ �� �� �������� ���������?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "��������������: ������������ ���������"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "������ ����"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "������ ����"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (�� ������������)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "������ ���������"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10185,8 +10393,8 @@ msgstr "������ �������"
 msgid "Subject does not contain"
 msgstr "������ ���������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10194,12 +10402,11 @@ msgstr ""
 "���� ��� ������ ��� ���� ����������.\n"
 "�� �� ��������� ��?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "������� ���� ������"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "������� ���� ������ �� �������� �� ���� �����"
 
@@ -10298,144 +10505,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "������"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "������"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "�������"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "�����"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "������"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "������"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "���"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "�������"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "�������"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "���"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "�����"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "������"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "������"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "�������"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "������"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "������"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "���������� �� �������� ����."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "������� ��� ��������� ����."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"������� �� ����������� �� ���� ��������\n"
-"� ������� ����� ��� ������ ���."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "�������� �����"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "������� �� ��� �����"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "����� ����������� ��� ��������"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "�������� ����� �� �� �� �������� ������"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "������ �����"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<��������� ��� �� �� �������� ����>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "����"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " �����"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "�����"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " �����"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<��������� ��� �� �� �������� ����>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "�������� ����� �� �� �� �������� ������"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "������� �� ����������"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "��� �� ����:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' �� ���������� ��� �� � ��������� ����"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "������ ��������:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "������"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "������ ��������"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10443,12 +10606,12 @@ msgstr ""
 "��� ���������� �� �������� �����.\n"
 "����, ������� �� � ������� ������� ����� �� ������."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "������ �����"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10457,92 +10620,167 @@ msgstr ""
 "������ � ��������� ����� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "�����"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "����"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "������"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "����"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "����"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "����"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "������ �� ��� ��� ���� ������."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "��� �� �������:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "�����������"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "���"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "��� ������ �������� �� ���������"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "��� ����� �� ���������� � ��������"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "������ ��������"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "������"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "�������"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "������ �����"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "���������� ������"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "���������� VFolders"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "�������"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "��������"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"������� �� ����������� �� ���� ��������\n"
+"� ������� ����� ��� ������ ���."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"������� �� ����������� �� ���� ��������\n"
+"� ������� ����� ��� ������ ���."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"������� �� ����������� �� ���� ��������\n"
+"� ������� ����� ��� ������ ���."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "��������� �����"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "����� ����������� ��� ��������"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "�����"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "������ ���� �����"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "�������� �����"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "������� �� ��� �����"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "��������� �� v�����"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "� ������ ������� ���������� �����"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "� ������ ������� � �������� ���������� �����"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "� ������ ������� �����"
 
@@ -10569,42 +10807,42 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "��������"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "������� � �����"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "�������� �� ����"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "��������� �� ����"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "�� �������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "�� �������� �"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "�� ����������"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "�� ����������"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "�� ����� ����"
@@ -10626,93 +10864,89 @@ msgid "ends with"
 msgstr "�������� �"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "�����"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "���� �����"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� ��-������ ��"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� �� ����� ��"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "�� �"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�������� ������t"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� �� ���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "�������� �� ���������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�������� � �����"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "������� ����������� �� �������"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "������ ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "����"
 
@@ -10728,57 +10962,87 @@ msgstr ""
 msgid "Replied to"
 msgstr "�������� ��"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�����"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "� ��-������ ��"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "� �� ����� ��"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "��������:"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "������ ������"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "����� ����"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "���������� ��������"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "������� �"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "�������� �����������"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "������ ������"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "������ �������"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "����������� �� �������"
 
@@ -10786,11 +11050,11 @@ msgstr "����������� �� �������"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "���� v����� ������ �� ��� ���."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "���������� � �� �������� ���� ���� ����� ���� ��������"
 
@@ -10798,31 +11062,31 @@ msgstr "���������� � �� �������� ���� ���� ����� ���� ��������"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ��������� ������ ����� Elm ����"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "���������..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "���� ���������"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "��������� %s ���� %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "������� �� \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "����"
 
@@ -10883,39 +11147,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ��������� ������ ����� ���� �� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�����"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "������� mail ���� %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "������� ����������"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "�������� ������"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "���������� ������"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10996,12 +11260,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "_���� ����������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "�������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11049,7 +11313,7 @@ msgstr "��������..."
 msgid "Change this folder's properties"
 msgstr "������� ����������� �� ���� �����"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11057,59 +11321,79 @@ msgstr ""
 "����� �� ������ ��������� �� ������ ��������� ���������, ���� ��������� ���� "
 "������ � �����."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "�� �� ������� ������ �� ��������� �� ����"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "��������������: ������������ ���������"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "���� _Mail ���������"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "������ ���������"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "���� ���������"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "�������� ���������"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "���� _Mail ���������"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "�� ���� �� ������������� mail ����������� �� Evolution �� �������������."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution �� ����."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "��������� ��� �������..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "�� ���� �� ����������� ����������� ��� shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� �� \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
@@ -11159,135 +11443,135 @@ msgstr "%d ����"
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ��������� _����� �� ���������"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VFolder ����� _����"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "_v����� �� ��������"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "v_����� �� ����������"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "������ ����� _Mailing List"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "������ ����� �_���"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "������ ����� ��_������"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ��_��������"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "������ ����� Mailing _List"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "���������� ���� ���� ���������..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "�����"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �� ��������"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� �� �������"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� ������"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "��������"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "����������"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�������"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "��������: ���������"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "��������: �����������"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "������� ���� �_����"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�������� ���� ��_�����"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "���������� �������"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�������� � �����..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������� � �����..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "������ �������� � ��������� �����"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "������� ������"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "������ ������� �� �����������"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "������ �� �������� ������"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "������ �� �������� ������ (%s)"
@@ -11353,76 +11637,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "��� �� ��� ��������� ����� ������ �� ������������ ����������."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution - �������� �� ������"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "�������� �� ������� � Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_������������ ���:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_���:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "��� �� ���� �� ����� ��� ��������� � ���� ���."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "�� ��������"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "������������ �� �� ������ �������?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "�������"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "������������� ���:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "������ ����"
@@ -11432,30 +11707,30 @@ msgstr "������ ����"
 msgid "Mail to %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "������ � %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail �� %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �������� ������"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "������ ������� �� ������"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11463,7 +11738,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11475,7 +11750,7 @@ msgstr ""
 "���������� ��� ������ ����.\n"
 "������ �� �� �� ������������� ����?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11483,7 +11758,7 @@ msgstr ""
 "���������� � �� ������������� ����������\n"
 "����� �� ��������� ����."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11492,7 +11767,7 @@ msgstr ""
 "����� �� ��������� ����."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11500,11 +11775,11 @@ msgstr ""
 "��� ��������� HTML-����������� ���������, �� �������� ���������� �� ����� "
 "HTML ����������� ����:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "������� ������� ����?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11512,32 +11787,28 @@ msgstr ""
 "����������� ���� ����.\n"
 "�������� �� �� �� �������?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "���� ��������� ������� ���� Bcc ���������."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������(�) �� �� ���� �� ��������� �����������."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "������ �� ������������� ������ account �� �� ���� �� ��������� ����."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11545,28 +11816,28 @@ msgstr ""
 "�� ���� �� ������ ������� ������� �� ���� ������.\n"
 "������ �� �� ���������� ������������ ��?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "���������� ��������"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�� %a, %Y-%m-%d � %H:%M, %%s ������:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "������� ��������(���/���) �"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������� �� ���, �� ������ �� ����������� ������ %d ���������?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11574,7 +11845,7 @@ msgstr ""
 "������ �� ����������� ���� ��������� ��������\n"
 "� ������� Drafts."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11582,39 +11853,39 @@ msgstr ""
 "������ �� ��������� ������ ���� ��������� ��������\n"
 "� ������� Sent."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������� �� ���, �� ������ �� ���������� �������� %d ���������?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "���� ������� ���������"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "������������ �� ����?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "������� ����������� ����..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������� ���������� ����������� ���������"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11627,7 +11898,7 @@ msgstr ""
 "\n"
 "������������ �� �� ������ �����������?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11636,28 +11907,28 @@ msgstr ""
 "������ ��� ��������� ������������ �� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���������� �� ��������� ����� %d �� %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "��������� �����������"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-�����"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "������������� ���������"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11679,7 +11950,7 @@ msgstr "���� ��������"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "���������� �������"
@@ -11700,20 +11971,21 @@ msgid "Add Signature"
 msgstr "������� ���������"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "����, �������� ������ ��� � ����� �� ���������� ���� ����. �������� "
 "\"����������\" ��-���� �� � ������������ �� ����� ���������,\n"
 "����� ��� �� ������ ���� ���������� �� ���� ��������� �� ������."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "����, �������� ���������� �� ������ ������ ��������� ������������ ���� ����. "
 "��� �� ��� ������� ������� ����������\n"
@@ -11724,24 +11996,23 @@ msgid "Please select among the following options"
 msgstr "����, �������� �� �������� �����"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "����, �������� ���������� ������� ������ �� ��������� �� ����. ��� �� ��� "
 "������� ������� ����������\n"
 "������������� ��� ������ ��������� �� ����."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "��� ����� ���������� ����������������� ������. �����, ������� �� ���������� "
 "�� ���� �\n"
@@ -11751,44 +12022,20 @@ msgstr ""
 "���� ��� �� ���� ������������� ���� �� ���������."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "�������� �� Evolution �� �������"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "����"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "������"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "����"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "����"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "������ %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "��������� ����������"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "��������� ��� �������..."
 
@@ -12053,241 +12300,229 @@ msgstr "������� � �������"
 msgid "Loading Images"
 msgstr "������� _��������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�������������� �� ���������� �����"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "��������� �� _���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP ������:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Mail ������������"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "������"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "���������� ����������"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "��������_���:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _���� ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "���� ������ �� ������� ���� ���� � ���������� � ������ _Bcc"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PGP"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "��������� ��������� ����������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "�������� ���������� Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "�� ���� �� ������ ���������"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "������� ���� �����_�"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "�������-��:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "����� �� ����������"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "������� ���� ������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "�� ������������"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "������ PGP ��������"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "������ _����� ��� ���������:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "������� � ������� ���������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "�������� ������� ���_�������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "������ ������������"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "��� �_�����:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "������� ���������"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "��������"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "�������� �� ����������"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��� �� ����:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "���������� Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12297,204 +12532,200 @@ msgstr ""
 "\n"
 "�������� �� \"�������\" �� �� ���������."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "�����"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_���� � ������:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_������ ������� �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�_����� �������� ���������� ��������� ������ �������� ���� ������"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "��� �� ����������_���:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_����������� �������� �� ��� email"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_������������ ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������� ��� ����������� �� �����"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML ���������:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "�� ������������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_����� ���:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "� HTML ����"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� �������� ��� ��������� � � ��������� �����"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ���� ��� ����������� �� ������"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "������_�� ����������� ���� \"���������\" ����:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_���:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_������ �� ������� �������� �� �������"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP ��� �� ��������:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���� ��� ��������� �� HTML ��������� �� �������� ����� �� � �����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���� ��_� ��������� �� ���� ��� ����"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� ������"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_���������"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "��������� �� Email"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "������ ������� ����"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_���� � ������:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "������� ���������� ������ (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_�����"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " ����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "�������� �� ������ 1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12518,207 +12749,217 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ���� �� ������ ��������� �������� �� S/MIME"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "������� ��������"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�� ���� �� ������ �������� ����������: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "������� �� �����..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "������� ��������"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "������ � %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "�����"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "������ Viewer"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "������� _��������"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�������� ������������� �� �����������"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "�_��������� ������:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "_������ �������� � �������"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "������ ��������������� �� ��������"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "������� ��������� ���� (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "������� �������� ����..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��������"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ���� �� ���������� MIME ���������. �������� �� � ������� ���."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "������ �����"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "�������-��"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "��"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�������� ��������: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "������� ����������� ����..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ���� �� ������ �������� �� �������� �� PGP"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 #, fuzzy
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 #, fuzzy
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� ��������� � ������� ���������. �������� �� ������� �� ���������� �� "
 "������ ����������."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "�������� ��� FTP ���� (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "�������� ��� ������� ���� (%s) ������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "�������� ��� ������� ���� (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "�������� ��� ���������� ����� (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������� ��� ���������� ������ ����� (\"%s\" type)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "������� �����"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "��������������� �� �����"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�� ���� �� ����� ���� ���������� � ����� %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�������� ����� \"%s\" � \"%s\" ������"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s �� ���� �� ���� ���������������� ������ �� � ������� �����"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12726,16 +12967,16 @@ msgstr ""
 "��� �� ���� ������ �� �������� ���� mailbox,\n"
 "���������� � �� �� ��������� �����."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �� ���� �� ��������� ������� �� ��������� �����."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12744,7 +12985,7 @@ msgstr ""
 "������ ��� '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12753,7 +12994,7 @@ msgstr ""
 "������ ��� ���������� �� ��������:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "������"
 
@@ -12761,100 +13002,100 @@ msgstr "������"
 msgid "Filtering Folder"
 msgstr "������ ����� �����"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "���������� �� ������"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "�����, ����������� ���� ��������� �������."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "��������� �� \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "��������� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "������ �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "����������."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "������� ����������� � �����"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�������� �������� � %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�������� �� ����������� � %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "��������� �� ����� � \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "���������� ���������"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� �� ����� %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "������ ��������� %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "��������� �� ����� %s"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "���������� �� �����"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "��������� �� �����"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� �� %d ���������"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12863,7 +13104,7 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12872,11 +13113,11 @@ msgstr ""
 "������ ��� ��������� �� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "�������� ���������"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12885,27 +13126,22 @@ msgstr ""
 "�� ���� �� ������ ������� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ���� �� ������ �������: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������ ������ � %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "�������"
 
@@ -12960,32 +13196,41 @@ msgstr "���: %s, ���: %s"
 msgid "Type: %s"
 msgstr "���: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "��������� � ���������� �� ����"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "�������� ������"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "���������� ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "��������� ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "����������� �������� ����������."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_������� ���� ������"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "������� ���� ������ �� �������� �� ���� �����"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "���������� ������ �� %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "���������� ������"
 
@@ -13012,7 +13257,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "���:"
 
@@ -13042,7 +13287,7 @@ msgstr "���������� ��������� - %s"
 msgid "Forwarded message"
 msgstr "���������� ���������"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "���������� ���������"
 
@@ -13056,7 +13301,7 @@ msgstr "��������� �� v����� %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� �� v����� �� uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13065,94 +13310,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "v�����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "���������� V�����"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "���� �� ����������� �� v����� '%s' ����� �� ����������."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "��� VFolder"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(���� ����)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "������������"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "����������"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "��������� �������� ���������"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "��� ����"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "�����"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "�� ����"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "��� ����"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "��������� ������ �� �����������"
 
@@ -13187,47 +13435,47 @@ msgstr "��������"
 msgid "Size"
 msgstr "������"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "�����"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "�������� �� ����������"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�������� �� ������"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "�������"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13251,16 +13499,16 @@ msgstr "��������� �� ����� \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "�� � ������ ������"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "����, �������� ������."
 
@@ -17724,11 +17972,11 @@ msgid "Kushiro Airport"
 msgstr "������ ������"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23149,8 +23397,8 @@ msgstr "���� ��������"
 msgid "Mail summary"
 msgstr "��������� �� ����"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "������� �����"
 
@@ -23168,15 +23416,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ���� �� ����"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "����� �� ����"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "������ �������� �� ������"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�������� URL �� ��������� �� ������ ����� ������ �� ��������"
 
@@ -23188,26 +23436,26 @@ msgstr "������ ��� ����������� �� RDF"
 msgid "News Feed"
 msgstr "������"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "�_�����"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "������"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "���� ������"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
@@ -24479,7 +24727,8 @@ msgid "Tasks "
 msgstr "������"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "�������������� ���������"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24536,7 +24785,7 @@ msgstr "������� �������"
 msgid "Cancel Operation"
 msgstr "�������� ����������"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24550,20 +24799,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "������ �����"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "�������"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Outbox"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "�������"
 
@@ -24799,22 +25048,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - ������ ���� �����"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"���� �� ��������� ����� �� � �������\n"
-"�� ��������� ��������."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "������ ���� �����..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "���..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(����������)"
 
@@ -24836,7 +25078,7 @@ msgstr ""
 "��� ���� �� �������� \"�����������\" ��� �� ������ � Evolution �� �� ����� "
 "�� �� ��������."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "����, �������� ������������ ����� ������ �� �����������:"
 
@@ -24867,21 +25109,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "������ `%s' �� ����������."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "������ � Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "��� ���� �� ����������� ���� ������� �����"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24890,11 +25128,11 @@ msgstr ""
 "���� �������� ����� �� �������\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "���������"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24903,17 +25141,17 @@ msgstr ""
 "���������� %s.\n"
 "��������� %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� ���������� �� %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� ����������� �� %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24922,31 +25160,31 @@ msgstr ""
 "���������� %s\n"
 "���������� ����� 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "�����������"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "������ ����"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "��� �� ����:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "������ �� ����� � ��������� �� ����� ��������"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "������ �� �������� ����"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24954,24 +25192,24 @@ msgstr ""
 "����, ���������...\n"
 "�������� �� ������������ ���������"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "�������� ������������ �����������"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "������ �����"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "����� �� ���������� ����� �� ����������� �� ���� �����"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "������"
 
@@ -25019,9 +25257,14 @@ msgstr "�������� �� ����� %s"
 msgid "in \"%s\" ..."
 msgstr "������ � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "�� ���� �� ����������� �������: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "�� ���� �� ������ ��������� �����:\n"
 "%s"
@@ -25039,8 +25282,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ���� �� ������������� mail ����������� �� Evolution.\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "���"
@@ -25081,58 +25324,59 @@ msgstr "����� � �����..."
 msgid "Select the folder that you want to open"
 msgstr "����� �� ����� ����� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "������ ���� ���������"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ������� �� ����� ������ �� ���� �����������:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "������ � 'O_nline' "
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "������ � '_Offline'"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "������ � 'Offline'"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(���� �������� �����)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(����)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution � ������� � 'online'.  �������� �� ���� ����� �� �� �� ����������� "
 "� ����� 'offline'."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution � � ������ �� ����������� �� ����� 'offline'."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution  � ������� � 'offline.' �������� �� ���� ����� �� �� �� "
 "����������� �� 'online'."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25144,12 +25388,12 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�� ���� �� ������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25161,31 +25405,31 @@ msgstr ""
 "�������������\n"
 "�� �� �������� ������ �� ������� ������."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "������ ���������"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "�� ���� �� ����������� � OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "����������������� ���� ����� �� � ��������"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "�������� ������"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "��� �� �����:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25194,107 +25438,117 @@ msgstr ""
 "������������ �� ������ �� �������� �����\n"
 "`%s' �� ������� � ���������?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "�� ��������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "���������� ����� ���������"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "���������� ��������� ����� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "����� �����"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "������� ��������� ���� ����� �����"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "��_���� �����"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "������� ��������� ���� ������ �����"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_���� �����..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "�_������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "�������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "�_��������� ���� �����..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "���������� ���� ����� ���������"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "�_����� ������� � ���������"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "������ ������� � ���������"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "������ ���� ���������"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "������ ���� ���������"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "���������� ���������"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "���������� ��������� ��������� ��:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "������ ������� �������� � ���� ���������"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "_������ � ��� ��������"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������ ����� �������� � ���� ��������� � ��� ��������"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_����������"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "����������� ���� ���������"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "��_������"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ��������� �� ������� � ���������"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "������ ��� ��������� �� ���������."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "���������"
 
@@ -25303,55 +25557,55 @@ msgstr "���������"
 msgid "Checkbox"
 msgstr "����"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "���� ������"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "����� ��� ������ ��� ���� ����������"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "���� �� ���������� ����� �� � �������"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "������/������� ������"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "���� ���������� ������������ �� ����������� �� �����"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "������� �� � ������"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "���������� ����� �� � ��������"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "��������� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "���������� �� �� �������"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "���������� ��� �� �� �������� � ���� ���������"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "���������� ����� �� ���� �� ���� ������������ ��� �������"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "�� ���� �� ������ ����� � ���� ���"
 
@@ -25406,63 +25660,63 @@ msgstr ""
 "�������� �� ���������� �� ��������� �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "������ � CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "���������"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "������ ��������"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "���� ��� ����������"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "���� ���������"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "�� � �������"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "���������� ���"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "����������� �����"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "����������� ��������"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "�������� ������"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "�����������"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "������ URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "��� ��������"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "���� �����"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "������� ���������� � �����"
 
@@ -25487,6 +25741,26 @@ msgstr "����"
 msgid "The following connections are currently active:"
 msgstr "�������� ������ �� � ������� �������:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "��������"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "��������:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_����"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "������"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "��� �� �����:"
@@ -25499,6 +25773,34 @@ msgstr "��� �� �����:"
 msgid "Specify where to create the folder:"
 msgstr "������� ���� �� ���� ��������� �������:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "������ ���� �����..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "��� �� �����:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "��� �� �������:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_������������ ���:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "�������� �� ��������� �� Evolution"
@@ -25596,15 +25898,15 @@ msgstr "�� �� ����� ������"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �� ���� �� ��������� ����� �� �������� �������:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ���� ������..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25624,53 +25926,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "������� Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "�� �� ����� ������"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "����� ������ �� Ximian Evolution shell."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�� ���� �� ������������� Ximian Evolution shell: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "��������� 'splash' �����"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "�������� ������"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "�������� ������������ �����������"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "������� ������ �� ������ �� ������ ���������� ��� ����."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�� ���� �� ������������� ��������� ���������� �� Bonobo"
 
@@ -25707,116 +26009,110 @@ msgstr "������ ���������"
 msgid "Copy to Folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "������ ��� �������"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "������ ��� ������ � �������"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "������ ���������"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "������ ��������� ��������"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "�������� ��������� ��������� � ���� �����"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "�������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "������� ������������ �� ������ �� �����"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "������� �� ���������� �� �����"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "������� �������"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "��������� ��������� ����������"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "������� ��������� �������� ���� VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "������ ������"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "������ ������ ��������"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "������� ��������� �� ������� ��������"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "������� ��������� ��� �������"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "������� ��������� ������� �� ����."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "����"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "�������� �����������"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "�������� �����"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_��������"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "������ _��������"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_������ � ��������..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "�������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_������ ���� VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "���_�� �� ��������"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "������ ������"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "������� ����������� �� �������.."
@@ -25861,11 +26157,6 @@ msgstr "�����"
 msgid "Previews the calendar to be printed"
 msgstr "������� �� �������� �� �����"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "������� �������"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "��������� ���� ��������"
@@ -25898,7 +26189,7 @@ msgstr "�������"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "�������"
 
@@ -25911,7 +26202,7 @@ msgid "Delete this item"
 msgstr "��������� �� ���� �����"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "������ ����� � �����������"
 
@@ -25923,8 +26214,8 @@ msgstr "������� �� ������� �� �����"
 msgid "Print this item"
 msgstr "����� �� ���� �����"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "�������"
 
@@ -25949,9 +26240,9 @@ msgstr "������� ���� ����� �� �����"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_����"
 
@@ -25961,7 +26252,7 @@ msgstr "����� �� �_���..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "������� �_���..."
 
@@ -25975,8 +26266,8 @@ msgstr "������� ����������� �� �������.."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_�������"
 
@@ -26074,26 +26365,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "������� �� ��������� ������ ��������� �� ���� �����"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "���� ���������"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "������� ����������� � �����"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "������� �������� �������� �� ��������� "
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "��������� � ����������� �� ����� �� ���������� �������"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "�������� �� ��������� �����"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_������..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_������������� ������� �� Pane"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_��������� � �����..."
 
@@ -26190,7 +26491,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr "_���������"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "�����"
 
@@ -26451,180 +26752,195 @@ msgstr "�������� ����������� ���������"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "������� �� ������"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "������� �� ���� ��������� ��� ������ �����"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "�������� ����� ���������"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "������� �� ����������� �� �����"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "��������� ���� ���������"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "�������� ��������� ��������� �� �����"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "������������ ������ � �������� ���������� ������"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "������� �� ���������..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "��-_�����"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "������� ����������� ���� �������� ����"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "������� �� ����� � ������ �� ����������� ���������"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "��������� �� ���������� �� ������ ����� �������"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "������� ��������� �� ��. ����"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "������ ������� ��������"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "������� ��������� � �������� ����"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "������� ��������� ��� ������ �������� ��������"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "������� ������������ ����������� �� ��. ����"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "���_��� �� �����"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "�� ������� ��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder ����� �������� ������..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VFolder ����� _��������"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VFolder ����� _����������"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VFolder ����� _����"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "��������"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_������� � �����"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_������ ������� �� �����������"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "�_��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "�����"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "������ � 'O_nline' "
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_��-�����"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "��������� �� _���������"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "�������� � _�����"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "������ _���������"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "�����������..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "���_��������"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "���������� �������"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "������� ���� ��������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "�������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_������"
 
@@ -26652,169 +26968,161 @@ msgstr "�������� ���� ��������� � ������ S/MIME ���������� �� ����������"
 msgid "For_mat"
 msgstr "_������"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "������ ������� ���� � �����������"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "������ ������� ����..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "������"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "������ ����"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP ����������"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP ������"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME ����������"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME ������"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "������� ����"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "������� _�������"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "������� ������� ����"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "������� �������� ���� � �������� ���"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "������� ����������� � �������� �����"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "�������"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "������� ��-�����"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "������� ��-�����"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "������� mail-� � HTML ������"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "������� ����������� ��-�����"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "������� ���� ��������� ����"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "������ / ������ ���������"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "������� _���������"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "������� ���������"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "������� ����������� � ������ PGP ����"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "������� ����������� � ������ S/MIME ����������"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "���������� ���� ������ BCC �� ���� ���������"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "���������� ���� ������ CC �� ���� ���������"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "���������� ���� ������ �� ����� �� '��' �� ���� ���������"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "���������� ���� ������ �������-�� �� ���� ���������"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_��������.."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc ����"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc ����"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "������� _������"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_�� ����"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_������"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_������..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "�������-�� ����"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "������� ������� � ������� �������"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_�����"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "������� ���������"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "������ ����� ��� ������ ������ �� ����� �� ���������"
@@ -26912,171 +27220,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "������ ��� ������ �� ������������"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "�������� "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "������� ����� �� ���� �����"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "������� ���� �����"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "������ ���� �����..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "������ ������ ��� ���� ����� � ������ �� ������������"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "������ ���� �����"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "������ ���� ���������"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "������ ���� �����"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "������ ���� �����"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "������ ����� �����"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "�����"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "�������� �� ��������"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "����� �� ����������"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "����� ����� �� ����� ��������"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "�������� ���� ����� �������"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "������ ���� �����..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "������ � ��� ��������"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "������ ���� ����� � ���� ��������"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "��������� �� Pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "������� �������� �� ���� � �������� ����"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Mail ������������"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "������ ���������� �� Ximian ��������"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "������� ������ �� ������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "������� ������ �� ������ ���� ��� ����"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "���������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "��������� ����������� �� ������ � �������"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "��������� ����������� �� ������ � ������������"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "��������� ������ ��/��-����"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "������ ��������� �����"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "������� Ximian ��������..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "�������..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "����� � �����"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "�����"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "����� � �����..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "�����..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "��������..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "���"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "���� �����"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "��������� �� Pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_���� ����������"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "��������� / ����������"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "���������"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "����� � ����������"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "���������"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "����� �� ��������"
@@ -27090,17 +27429,40 @@ msgid "Reload the view"
 msgstr "���������� ��������"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "������� �����"
+#, fuzzy
+msgid "By _Company"
+msgstr "�� ��������"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "�� ��������"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "������� �����"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "��������� ������"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "������ �� �������"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "_������ �� ���"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "����� �� �����"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "������ �� ������� �������"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27126,13 +27488,19 @@ msgstr "�� ����"
 msgid "Messages"
 msgstr "���������"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "� ���������"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_������"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27286,11 +27654,11 @@ msgstr "���������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "�������� �� �������"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "������ �������"
 
@@ -27330,21 +27698,21 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� �������� ���� ��������� ������."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "�������"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "������ ����"
 
@@ -27358,18 +27726,128 @@ msgstr "������ �� ������������ ������� �����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "������ �� ���������� ��������; ������� �� ��������"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ���� �� ������������� GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ���� �� ������������� GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution �� � � ��������� �� ������ ��������� ����� �� ������� "
+#~ "���������.\n"
+#~ "���� ���� �� ���� ������ ��������� �� evolution �� ��������� ����� �� "
+#~ "������.\n"
+#~ "�� �� �� ��������� ��-����� �� �������� � ����� ��������,\n"
+#~ "���� ��������� ���� �� <trow@ximian.com> � �������� ����������\n"
+#~ "���������� ��."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "��������..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "������� �� ������� � ��������. �� ������� ���������� ������?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_������ ���� �����"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "������/������� ������"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO �������� �� ������� %s: �� � �������"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO ������ ������� %s: �� � �������"
+
+#~ msgid "Insert File"
+#~ msgstr "������ ����"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "������� ��� ��������� ����."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution - �������� �� ������"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "������� �� ���, �� ������ �� �������� ���� ������?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "������ �� ������������� ������ account �� �� ���� �� ��������� ����."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP ������:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "������"
+
+#~ msgid "Source"
+#~ msgstr "��������"
+
+#~ msgid "Source Information"
+#~ msgstr "�������� �� ����������"
+
+#~ msgid "newswindow1"
+#~ msgstr "�������� �� ������ 1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "������� �� �����..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "������� ����������� ����..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - ������ ���� �����"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "���� �� ��������� ����� �� � �������\n"
+#~ "�� ��������� ��������."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "��� ���� �� ����������� ���� ������� �����"
+
+#~ msgid "_Contact List"
+#~ msgstr "������ _��������"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "������ ������� ���� � �����������"
+
+#~ msgid "Insert text file..."
+#~ msgstr "������ ������� ����..."
+
+#~ msgid "Send _Later"
+#~ msgstr "������� ��-�����"
+
+#~ msgid "Send _later"
+#~ msgstr "������� ��-�����"
+
+#~ msgid "Send the message later"
+#~ msgstr "������� ����������� ��-�����"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "��������� �� Pilot..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "��������� �� ������"
@@ -27505,10 +27983,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgstr "��������"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "���� � ������:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "������� ������ ���������"
 
@@ -27887,12 +28361,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "�������"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "������� ���� ����"
-
-#~ msgid "Create a new task"
-#~ msgstr "������� ���� ������"
-
 #~ msgid "New _Task"
 #~ msgstr "���� _������"
 
@@ -27987,9 +28455,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ "it."
 #~ msgstr "���� �� �� ������ ��� POP ������ ��������� �� ���������� Kerberos 4"
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "�� ���� �� �� ���������� ���� KPOP ������: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "�� ���� �� �� ������ ��� ������ %s"
 
@@ -28032,9 +28497,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "����� �� ����������� �� ���� (��������)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "�� ���� �� �� ������ ��� ��������� %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "���� _Mail ���������"
 
@@ -28086,9 +28548,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_�����������:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_������� ���� ������"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_������� mail � HTML ������ �� ������������."
 
@@ -28158,9 +28617,6 @@ msgstr "init_bonobo(): �� ���� �� ������������� Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "������� ��� ��������� �������� ������� � ����� ���������"
 
-#~ msgid "New Message"
-#~ msgstr "���� ���������"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "�������� ���������..."
 
diff --git a/po/ca.po b/po/ca.po
index a7706a2927..1b4d2ec426 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "File As"
 msgstr "Arxiva com:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
@@ -370,53 +370,53 @@ msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "_Par�metres"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Imprimeix l'agenda"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr ""
@@ -520,11 +520,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contactes..."
@@ -548,27 +548,36 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "New Contact List"
+msgid "New Contact"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "Contact _List"
+msgid "_Contact"
 msgstr "_Contactes..."
 
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact"
+msgid "Create a new contact"
+msgstr "Crea un nou contacte"
+
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "New Contact List"
 msgstr "Visualitza tots els contactes"
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
-msgid "_Contact"
+msgid "Contact _List"
 msgstr "_Contactes..."
 
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crea un nou contacte"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -593,30 +602,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
@@ -626,18 +635,18 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 msgid "Other Contacts"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -645,54 +654,54 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "acaba amb"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Adre�a electr�nica 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "categories"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos cont�"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "categories"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrar� el navegador de carpetes"
 
@@ -820,7 +829,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Afegeix una font"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -915,8 +924,8 @@ msgstr "Configuraci� del correu"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -971,8 +980,8 @@ msgstr "Cerca"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "Cerca"
@@ -1163,15 +1172,15 @@ msgid "Using email address"
 msgstr "Adre�a electr�nica:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Afegeix"
 
@@ -1217,12 +1226,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edita"
@@ -1340,10 +1349,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Elimina"
 
@@ -1377,33 +1386,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacte _nou"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Cerca un contacte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Seleccioneu els noms"
@@ -1426,15 +1417,10 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "_Browse..."
-msgstr "Mou"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
 msgid "_Category:"
 msgstr "categories"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "_Folder:"
 msgstr "_Carpeta"
@@ -1548,11 +1534,12 @@ msgstr "Vol rebre correu _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -2872,7 +2859,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 #, fuzzy
 msgid "_Remove"
 msgstr "Elimina"
@@ -2939,7 +2926,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Afegeix..."
@@ -2970,14 +2957,14 @@ msgid "Error getting book view"
 msgstr "Error en carregar el fitxer: %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "Error en carregar el fitxer: %s"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 #, fuzzy
 msgid "Success"
 msgstr "Fonts"
@@ -2985,8 +2972,8 @@ msgstr "Fonts"
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -2995,8 +2982,8 @@ msgstr "Error desconegut"
 msgid "Repository offline"
 msgstr "S'est� movent"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Perm�s denegat"
 
@@ -3015,7 +3002,7 @@ msgid "Protocol not supported"
 msgstr "Operaci� no suportada"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -3040,53 +3027,58 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
+msgid "Addressbook does not exist"
+msgstr "La carpeta `%s' no existeix."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+#, fuzzy
 msgid "Other error"
 msgstr "Error d'E/S"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 #, fuzzy
 msgid "Error adding list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 #, fuzzy
 msgid "Error adding card"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #, fuzzy
 msgid "Error modifying list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 #, fuzzy
 msgid "Error removing list"
 msgstr "Error en carregar el fitxer: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "_Visualitzaci�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3094,22 +3086,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "No iniciat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "No iniciat"
@@ -3197,7 +3189,7 @@ msgstr "Desa a la llibreta d'adreces"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
@@ -3237,7 +3229,7 @@ msgid "Pilot Settings..."
 msgstr "_Par�metres"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Reenvia"
@@ -3248,8 +3240,8 @@ msgid "Send Message to Contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimeix"
@@ -3270,7 +3262,7 @@ msgid "Move to folder..."
 msgstr "Mou a la carpeta"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
@@ -3282,20 +3274,20 @@ msgid "Copy"
 msgstr "Copia"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Enganxa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Suprimeix"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "l'hora actual"
@@ -3469,7 +3461,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opcions"
 
@@ -3561,26 +3553,26 @@ msgstr "Edita una cita"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
@@ -3714,12 +3706,12 @@ msgstr "Durada de l'snooze (minuts)"
 msgid "_Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 #, fuzzy
 msgid "No description available."
 msgstr "No hi ha cap resum disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3727,14 +3719,14 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "S'est� movent"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3745,7 +3737,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Envia aquest missatge"
@@ -3780,7 +3772,7 @@ msgstr "Descripci�:"
 msgid "Comment contains"
 msgstr "cont�"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3792,7 +3784,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3816,17 +3808,17 @@ msgstr "%A, %d de %B de %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3851,7 +3843,7 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3859,23 +3851,23 @@ msgstr "setmana"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -3883,7 +3875,7 @@ msgstr "En proc�s"
 msgid "Completed"
 msgstr "% comp_let:"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3894,63 +3886,62 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 #, fuzzy
 msgid "Recurring"
 msgstr "Recurr�ncia"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 #, fuzzy
 msgid "Assigned"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 #, fuzzy
 msgid "No"
 msgstr "Ara"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 #, fuzzy
 msgid "Day View"
 msgstr "Cotxe"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 #, fuzzy
 msgid "Work Week View"
 msgstr "Setmana de treball"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 #, fuzzy
 msgid "Week View"
 msgstr "Setmana"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 #, fuzzy
 msgid "Month View"
 msgstr "Mes"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3958,12 +3949,12 @@ msgstr "Agenda"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -3972,45 +3963,64 @@ msgstr "Tasques"
 msgid "Folder containing to-do items"
 msgstr "Filtre sobre la llista de correu"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova cita..."
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cites:"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Crea una nova cita"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crea un nou contacte"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "_Task"
 msgstr "Tasca"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 #, fuzzy
-msgid "New All Day Appointment"
-msgstr "Nova cita..."
+msgid "Create a new task"
+msgstr "Crea un nou contacte"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "All _Day Appointment"
+msgid "New All Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "New appointment"
+msgid "All _Day Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "Cites:"
+msgid "Create a new all-day appointment"
+msgstr "Crea una nova cita"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -4084,7 +4094,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dies"
 
@@ -4093,11 +4104,13 @@ msgstr "dies"
 msgid "extra times every"
 msgstr "_Actualitza lliure/ocupat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuts"
 
@@ -4236,7 +4249,7 @@ msgstr "Recordatoris"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -4268,7 +4281,7 @@ msgstr "Recorda'm totes les cites"
 msgid "hour(s)"
 msgstr "hores"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 #, fuzzy
 msgid "minute(s)"
 msgstr "minuts"
@@ -4460,7 +4473,7 @@ msgid "_Fri"
 msgstr "dv."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4510,25 +4523,39 @@ msgstr "dc."
 msgid "before every appointment"
 msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
@@ -4602,61 +4629,61 @@ msgstr ""
 msgid "Due "
 msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sense resum"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4897,7 +4924,7 @@ msgid "Member"
 msgstr "desembre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4910,7 +4937,7 @@ msgstr "M�bil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -4999,7 +5026,7 @@ msgstr "el"
 msgid "first"
 msgstr "primer"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segon"
 
@@ -5022,7 +5049,7 @@ msgstr "�s"
 msgid "Other Date"
 msgstr "Un altre fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dia"
 
@@ -5128,22 +5155,29 @@ msgstr "% comp_let:"
 msgid "Date Completed:"
 msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "Elimina una acci�"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
 msgid "Progress"
 msgstr "En proc�s"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 #, fuzzy
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Estat:"
 
@@ -5159,7 +5193,7 @@ msgstr "Enganxa"
 msgid "Assignment"
 msgstr "Assigna una puntuaci�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5229,88 +5263,88 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Obre"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "_Tasca (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5320,8 +5354,8 @@ msgstr "Feu clic aqu� per a la llibreta d'adreces"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 #, fuzzy
 msgid "Complete"
 msgstr "% comp_let:"
@@ -5353,11 +5387,9 @@ msgstr "Prioritat"
 msgid "Start Date"
 msgstr "Data d'ini_ci:"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 #, fuzzy
 msgid "Summary"
 msgstr "R_esum"
@@ -5402,120 +5434,119 @@ 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.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Tasca"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimeix..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "V�s a avui"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "V�s a una data"
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Mou a la carpeta"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Anomena i desa..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix-ne aquesta aparici�"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Error en desar el fitxer: %s"
@@ -5565,7 +5596,7 @@ msgstr "% comp_let:"
 msgid "Task Due: <b>"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Cap informaci�"
@@ -5576,367 +5607,372 @@ msgstr "Cap informaci�"
 msgid "iCalendar Error"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "Error desconegut"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Accions"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Estat:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "set"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Tentatiu"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Suprimeix"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "FIXME: Pe_tici� de cita"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Fitxer de signatura:"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "_Edita el missatge"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "TaskPad"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "FIXME: _Petici� de tasca"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "Respon"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Cancel�lat"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Agenda"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Cap informaci�"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Aquesta �s l'adre�a de correu"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Imprimeix el missatge"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "No es pot executar el Bug Buddy."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Data completa:"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Tots els assistents"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% comp_let:"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data d'enviament"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccioneu una carpeta"
@@ -5988,7 +6024,7 @@ msgstr "Inici del dia:"
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "Persones _requerides"
@@ -6004,62 +6040,56 @@ msgid "Non-Participants"
 msgstr "Persones _requerides"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "Grup %i"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "Font"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Chair"
 msgstr "Cotxe"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 #, fuzzy
 msgid "Required Participant"
 msgstr "Persones _requerides"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "Elimina una acci�"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentatiu"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "Suprimeix"
@@ -6151,53 +6181,49 @@ msgstr "Hora d'_inici de la reuni�:"
 msgid "Meeting _end time:"
 msgstr "Hora de _finalitzaci� de la reuni�:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Completat"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Suprimeix un contacte"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "_Esborra"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-week-view.c:3489
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "Suprimeix aquesta cita"
-
 #: calendar/gui/gnome-cal.c:1522
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
@@ -6210,11 +6236,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�tode necessari per carregar `%s' no est� suportat"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Obre l'agenda"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "S'estan escanejant les carpetes de \"%s\""
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -6285,58 +6316,63 @@ msgstr "octubre"
 msgid "September"
 msgstr "setembre"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Cap informaci�"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "ha estat despr�s de"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Refresca la llista"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -6569,9 +6605,8 @@ msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Previsualitzaci� d'impressi�"
 
@@ -6603,8 +6638,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Envia aquest missatge"
@@ -6662,128 +6697,140 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "No s'ha pogut connectar al servidor POP en %s."
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatori"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Agenda"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "_Obre una agenda"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8405,77 +8452,87 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 #, fuzzy
 msgid "Syncing folders"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 #, fuzzy
 msgid "Cannot open message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "S'est� sincronitzant \"%s\""
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "adjunci�"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "adjunci�"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "No s'ha pogut crear el conducte a %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Error en desar el fitxer: %s"
@@ -8536,7 +8593,7 @@ msgstr "C�pia de missatges"
 msgid "Copying messages"
 msgstr "C�pia de missatges"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8544,47 +8601,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 #, fuzzy
 msgid "Cancelled."
 msgstr "Cancel�lat"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "(Cap carpeta mostrada)"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8592,18 +8649,18 @@ msgid ""
 "%.*s"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Missatge de _correu (FIXME)"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
@@ -8629,24 +8686,24 @@ msgid "Could not lock '%s'"
 msgstr "No s'ha pogut bifurcar: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "S'ha excedit el temps m�xim en intentar recuperar el fitxer de blocatge en %"
 "s. Torneu-ho a provar m�s tard."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8705,11 +8762,15 @@ msgstr "Error en escriure el fitxer temporal de correu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8850,7 +8911,7 @@ msgid ""
 msgstr "No s'ha pogut crear el conducte: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
@@ -9033,26 +9094,129 @@ msgstr "No es pot bifurcar %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, fuzzy, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
-msgstr "Assumpte"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
+msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Fitxer de signatura:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Error en carregar el fitxer: %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Fora de l'oficina"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "adjunci�"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9061,16 +9225,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9087,32 +9263,37 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Error en carregar el fitxer: %s"
+
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No es pot bifurcar %s: %s"
@@ -9120,13 +9301,13 @@ msgstr "No es pot bifurcar %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Obre l'agenda"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor ha rebutjat el nom d'usuari"
@@ -9156,45 +9337,45 @@ msgstr "La resposta del servidor IMAP no contenia la informaci� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 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:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "S'estan desant els canvis al missatge..."
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 #, fuzzy
 msgid "This message is not currently available"
 msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -9203,10 +9384,10 @@ msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Missatge de _correu (FIXME)"
@@ -9221,7 +9402,7 @@ msgstr "Comprova si hi ha nou correu"
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Carpetes"
 
@@ -9254,7 +9435,7 @@ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -9264,17 +9445,17 @@ msgstr ""
 "Aquesta opci� es connectar� al servidor IMAP mitjan�ant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
@@ -9282,58 +9463,62 @@ msgstr "Servei %s per a %s en %s"
 msgid "Connection cancelled"
 msgstr "Cancel�lat"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 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:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci� no suportada"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "La carpeta `%s' no existeix."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, fuzzy, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autenticaci�:"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9344,31 +9529,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%2$s%1$s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%2$s%1$s"
@@ -9394,7 +9585,9 @@ msgstr "Carpetes virtuals"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9424,12 +9617,12 @@ msgstr ""
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9440,38 +9633,38 @@ msgstr ""
 msgid "Store root %s is not a regular directory"
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
@@ -9533,7 +9726,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9574,26 +9767,26 @@ msgstr ""
 "No s'ha pogut crear la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No es pot obrir la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Comprova si hi ha nou correu"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "C�pia de missatges"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9639,7 +9832,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9648,7 +9841,7 @@ msgstr ""
 "No s'ha pogut obrir el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9657,14 +9850,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9673,7 +9866,7 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no �s buida. No s'ha suprimit."
@@ -9690,13 +9883,13 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9704,53 +9897,53 @@ msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, 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:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Incongru�ncia del resum, s'est� interrompent la sincronitzaci�"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la b�stia de correu temporal: %s"
@@ -9902,52 +10095,52 @@ msgstr "Cancel�lat"
 msgid "Operation failed: %s"
 msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Obre l'agenda"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Error desconegut"
@@ -9967,7 +10160,7 @@ msgstr "No suprimeixis els missatges del servidor"
 msgid "Delete after %s day(s)"
 msgstr "Suprimeix la tasca"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9994,6 +10187,11 @@ msgstr ""
 "xifrada mitjan�ant el protocol APOP. Aix� no funcionar� per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "No s'ha pogut connectar a %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -10005,54 +10203,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Error d'E/S"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10082,35 +10282,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "El sendmail ha acabat amb l'estat %d: no s'ha enviat el correu."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -10229,46 +10429,46 @@ msgstr "Autenticaci�:"
 msgid "Authentication required"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaci� sol�licitat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sSi us plau, introdu�u la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10279,95 +10479,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, fuzzy, c-format
 msgid "SMTP server %s"
 msgstr "Servidor %s %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, fuzzy, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament de correu mitjan�ant el programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 #, fuzzy
 msgid "Sending message"
 msgstr "Envia aquest missatge"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Error desconegut: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autenticaci�:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
@@ -10375,90 +10575,90 @@ msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, fuzzy, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Error desconegut: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Error desconegut: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "adjunci�"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Afegeix una adjunci�..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Aquest fitxer no �s habitual."
@@ -10476,57 +10676,61 @@ msgid "MIME type:"
 msgstr "Tipus de MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Feu clic aqu� per a la llibreta d'adreces"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "De:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Respon"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Introdu�u els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�ntrodu�u les adreces que rebran una c�pia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10534,17 +10738,25 @@ msgstr ""
 "introdu�u les adreces que rebran una c�pia del missatge sense apar�ixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Prioritat:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10553,63 +10765,63 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 #, fuzzy
 msgid "Warning!"
 msgstr "S'est� movent"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10619,60 +10831,55 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Reenvia el missatge"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:1569
-#, fuzzy
-msgid "Insert File"
-msgstr "FIXME: Insereix el fitxer..."
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Fitxer de signatura:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "Valors predeterminats"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10742,8 +10949,8 @@ msgstr "L'assumpte cont�"
 msgid "Subject does not contain"
 msgstr "L'assumpte no cont�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10751,12 +10958,11 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10868,164 +11074,112 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I:%M %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "any"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "anys"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "segons"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mes"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mesos"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hora"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "setmana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "hora"
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut"
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "segons"
-
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr ""
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mes"
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr ""
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mesos"
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La data del missatge es comparar� amb l'hora,\n"
-"sigui quina sigui, en qu� s'executi el filtre\n"
-"o s'obri la vfolder."
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "any"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La data del missatge es comparar� amb l'hora\n"
-"que indiqueu aqu�."
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "anys"
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
-"La data del missatge es comparar� amb una hora\n"
-"relativa a quan s'executi el filtre;\n"
-"\"fa una setmana\", per exemple."
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "l'hora actual"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "una hora que indiqueu"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "una hora relativa a l'actual"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-#, fuzzy
-msgid "Select a time to compare against"
-msgstr "Fitxer de signatura:"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Compara-la amb"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<feu clic aqu� per seleccionar una data>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "ara"
 
-#: filter/filter-datespec.c:575
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
 #, fuzzy
-msgid " ago"
-msgstr "fa"
+msgid "%d-%b-%Y"
+msgstr "%a %d %b"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr "fa"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
+#: filter/filter-datespec.c:407
 #, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<feu clic aqu� per seleccionar una data>"
+msgid "Select a time to compare against"
+msgstr "Fitxer de signatura:"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nom de l'estil:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' no �s un fitxer habitual."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Fitxer de signatura:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Aleshores"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Afegeix una acci�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -11034,101 +11188,176 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "S'est� movent"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Per a"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "despr�s de"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Sense t�tol"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "outgoing"
 msgstr "Agrupament"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Compara-la amb"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Filtres d'edici�"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Edita les VFolders"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 #, fuzzy
 msgid "Outgoing"
 msgstr "Contorn:"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La data del missatge es comparar� amb l'hora\n"
+"que indiqueu aqu�."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La data del missatge es comparar� amb una hora\n"
+"relativa a quan s'executi el filtre;\n"
+"\"fa una setmana\", per exemple."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La data del missatge es comparar� amb l'hora\n"
+"que indiqueu aqu�."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "una hora relativa a l'actual"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "fa"
+
+#: filter/filter.glade.h:25
 #, fuzzy
 msgid "specific folders only"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "l'hora actual"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "una hora que indiqueu"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Fonts de la vFolder"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 #, fuzzy
 msgid "with all local folders"
 msgstr "Crea una carpeta nova"
@@ -11159,43 +11388,43 @@ msgid "Beep"
 msgstr "Mida"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Empresa"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Suprimeix"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "no cont�"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "no existeix"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "no existeix"
+
 #: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
@@ -11220,95 +11449,91 @@ msgid "ends with"
 msgstr "acaba amb"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 #, fuzzy
 msgid "Exist"
 msgstr "S_urt"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existeix"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressi�"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�s"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "ha estat despr�s de"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "ha estat abans de"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "�s m�s gran que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "�s m�s petit que"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "no �s"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "etiqueta9"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 #, fuzzy
 msgid "Mailing list"
 msgstr "Llista de correu %s"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Header"
 msgstr "Cos del missatge"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "FIXME: Nou _missatge per contactar"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Final del dia:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 #, fuzzy
 msgid "Read"
 msgstr "R�dio"
@@ -11326,61 +11551,91 @@ msgstr ""
 msgid "Replied to"
 msgstr "Respon a tots"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "�s m�s gran que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "�s m�s petit que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Set Status"
 msgstr "Estat de la connexi�"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Mida"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "cont�"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Especifiqueu la cap�alera"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "comen�a per"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Estat de la connexi�"
+
+#: filter/rule-editor.c:180
 #, fuzzy
 msgid "Rules"
 msgstr "M�bil"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Afegeix una regla"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Filtres d'edici�"
@@ -11390,12 +11645,12 @@ msgstr "Filtres d'edici�"
 msgid "Score Rules"
 msgstr "Edita la regla de puntuaci�"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Suprimeix aquest element"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11403,33 +11658,33 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "acaba amb"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "S'est� movent"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "S'est� examinant %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 #, fuzzy
 msgid "Mail"
 msgstr "_Correu"
@@ -11487,43 +11742,43 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 #, fuzzy
 msgid "Trash"
 msgstr "Tasca"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fitxer de correu local %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 #, fuzzy
 msgid "Starting import"
 msgstr "Data d'_inici:"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 #, fuzzy
 msgid "Settings"
 msgstr "_Par�metres"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filtres d'edici�"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11611,12 +11866,12 @@ msgstr "Utilitat de configuraci� per al conducte de l'agenda de l'Evolution.\n"
 msgid "Font Preferences"
 msgstr "Prefer�ncies"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "cont�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Prefer�ncies"
@@ -11671,69 +11926,89 @@ msgstr "Propietats..."
 msgid "Change this folder's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap m�tode de transport de correu"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Reenvia el missatge"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "_Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Redacta un missatge"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "_Missatge"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "_Imprimeix el missatge"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "FIXME: Missatge de _correu"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connexi� de prova a \"%s\""
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propietats..."
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
@@ -11783,147 +12058,147 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "_Anomena i desa..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "% comp_let:"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Agenda"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 #, fuzzy
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Suprimeix"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Desa a la llibreta d'adreces"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Carpetes virtuals"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
@@ -11991,89 +12266,76 @@ msgstr ""
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "Conducte de les coses per fer de l'Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Host:"
 msgstr "Hores"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "Cam�:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 #, fuzzy
 msgid "Don't delete"
 msgstr "Suprimeix"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 #, fuzzy
 msgid "Disable"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-#, fuzzy
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Inhabilitat"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "cont�"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -12082,30 +12344,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assumpte"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -12113,7 +12375,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -12125,7 +12387,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -12133,7 +12395,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -12142,18 +12404,18 @@ msgstr ""
 "abans de poder redactar correu."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -12161,66 +12423,59 @@ msgstr ""
 "Aquest missatge no t� cap assumpte.\n"
 "Voleu que l'envi� igualment?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "S'est� afegint un missatge sense cap assumpte"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
 
-#: mail/mail-callbacks.c:499
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Cal que configureu una identitat\n"
-"abans de poder redactar correu."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Error desconegut"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -12228,7 +12483,7 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
@@ -12237,44 +12492,44 @@ msgstr ""
 "Nom�s podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Esteu segur que voleu\n"
 "suprimir aquest contacte?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 #, fuzzy
 msgid "No Message Selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -12282,7 +12537,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -12291,29 +12546,29 @@ msgstr ""
 "Error en carregar la informaci� del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 #, fuzzy
 msgid "Filters"
 msgstr "_Filtres de correu ..."
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressi� del missatge"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12336,7 +12591,7 @@ msgstr "Descripci�:"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacte _nou"
@@ -12359,15 +12614,14 @@ msgstr "Fitxer de signatura:"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -12377,60 +12631,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Conducte de les coses per fer de l'Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "S'est� movent"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Per a"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "despr�s de"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "cont�"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 #, fuzzy
 msgid "Connecting to server..."
 msgstr "Connexi� de prova a \"%s\""
@@ -12701,461 +12929,442 @@ msgstr "Desa i tanca"
 msgid "Loading Images"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "Format"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cos del missatge"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�s"
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "NNTP Server:"
-msgstr "Servidor:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Edita el servidor de not�cies"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Optional Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organitzaci�:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimeix els contactes"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Qmail maildir "
 msgstr "Adre�a electr�nica 2"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "No es pot recuperar el missatge: %s"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quoted"
 msgstr "Cap"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Respon"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Data de recepci�"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Desa com a VCard"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Required Information"
 msgstr "Cap informaci�"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Valors predeterminats"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccioneu els noms"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Agenda"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configuraci� del correu"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mostra la barra de _dreceres"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Font"
-
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Source Information"
-msgstr "Cap informaci�"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nom de l'estil:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "�ltim"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autenticaci�:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprova si hi ha nou correu"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Valors predeterminats"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Reenvia"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitat"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "Nom:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, 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:174
+#: mail/mail-config.glade.h:170
 #, 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:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Respon a tots"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Inhabilitat"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "Colors"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "Descripci�:"
 
-#: mail/mail-config.glade.h:189
-#, fuzzy
-msgid "newswindow1"
-msgstr "finestra1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -13184,214 +13393,224 @@ msgstr "No s'ha pogut crear el quadre de di�leg."
 msgid "Could not create a S/MIME decode context."
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Desa al disc..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Desa l'adjunci�"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Visualitza en l�nia"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en l�nia (mitjan�ant %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Missatge reenviat - %s"
+
+#: mail/mail-display.c:1454
 #, fuzzy
 msgid "Loading message content"
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Elements que ja han ven�ut:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Obre'l en una nova finestra"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "_Contacte (FIXME)"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "_Tasca (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunci�"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 #, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data de venciment"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adre�a electr�nica:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De:"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 #, fuzzy
 msgid "Reply-To"
 msgstr "Respon"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correu"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Anomena i desa..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No s'ha pogut crear el quadre de di�leg."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetes virtuals"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "No es pot desar la informaci� meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'est� convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13399,16 +13618,16 @@ msgstr ""
 "Si ja no podeu obrir aquesta b�stia de correu\n"
 "potser us caldr� reparar-la manualment."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13417,7 +13636,7 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13426,7 +13645,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 #, fuzzy
 msgid "Working"
 msgstr "S'est� movent"
@@ -13436,152 +13655,147 @@ msgstr "S'est� movent"
 msgid "Filtering Folder"
 msgstr "Fi_ltre sobre el remitent"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Sendmail"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'est� enviant \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "S'est� escrivint el missatge %d de %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "S'est� marcant el missatge %d de %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 #, fuzzy
 msgid "Complete."
 msgstr "% comp_let:"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Configura la carpeta"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 #, fuzzy
 msgid "Expunging folder"
 msgstr "S'est� esborrant \"%s\""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "C�pia de missatges"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, 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:1915
+#: mail/mail-ops.c:1940
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Desa l'adjunci�"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, 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:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Disconnecting from %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "S'est� recollint el correu des de %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Search"
 msgstr "Cerca"
@@ -13645,37 +13859,46 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tipus:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancel�lat"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 #, fuzzy
 msgid "Updating..."
 msgstr "_Par�metres"
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 #, fuzzy
 msgid "Waiting..."
 msgstr "_Par�metres"
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "Si us plau, introdu�u la contrasenya NNTP per a %s@%s"
@@ -13707,7 +13930,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nom:"
 
@@ -13738,7 +13961,7 @@ msgstr "Missatge reenviat - %s"
 msgid "Forwarded message"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Reenvia el missatge"
@@ -13753,7 +13976,7 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "Updating vfolders for uri: %s"
 msgstr "S'est� carregant la carpeta %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13762,106 +13985,110 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Carpetes"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Edita les VFolders"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "_Missatge"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "No s'ha pogut enviar el missatge: %s"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Mou el missatge"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 #, fuzzy
 msgid "Lowest"
 msgstr "Baixa"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 #, fuzzy
 msgid "Lower"
 msgstr "Baixa"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 #, fuzzy
 msgid "Higher"
 msgstr "Alta"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 #, fuzzy
 msgid "Highest"
 msgstr "Alta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1101
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 #, fuzzy
 msgid "Generating message list"
 msgstr "C�pia de missatges"
@@ -13898,47 +14125,47 @@ msgstr "Data de recepci�"
 msgid "Size"
 msgstr "Mida"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Crida de retorn"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "V�s endavant en el temps"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Cap informaci�"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Reenvia"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Previsualitzaci�:"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "FIXME: _Assenyala per al seguiment..."
@@ -13963,18 +14190,18 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "Carpetes"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 #, fuzzy
 msgid "No server has been selected"
 msgstr "S'ha rebut el missatge"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18818,11 +19045,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24760,8 +24987,8 @@ msgstr "Descripci�:"
 msgid "Mail summary"
 msgstr "Sense resum"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "Carpetes virtuals"
@@ -24780,16 +25007,16 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Afegeix un servidor de not�cies"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24803,27 +25030,27 @@ msgstr "Error en carregar el fitxer: %s"
 msgid "News Feed"
 msgstr "Servidors de not�cies"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Afegeix"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Mostra"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 #, fuzzy
 msgid "No tasks"
 msgstr "Mostra les _adjuncions"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "(Sense descripci�)"
@@ -26157,7 +26384,7 @@ msgstr "Tasques"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "Weather settings"
+msgid "Weather Settings"
 msgstr "Par�metres de prova"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -26224,7 +26451,7 @@ msgstr "Detalls"
 msgid "Cancel Operation"
 msgstr "Cancel�lat"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -26238,21 +26465,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Afegeix una regla de la VFolder"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Data de venciment"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Vist"
@@ -26485,22 +26712,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crea una nova carpeta"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"El tipus de la carpeta seleccionada no �s v�lid per a\n"
-"l'operaci� sol�licitada."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "_Crea una carpeta nova..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sense t�tol)"
 
@@ -26517,7 +26737,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -26543,111 +26763,107 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "No hi ha nou correu a %s."
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 #, fuzzy
 msgid "Importing"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 #, fuzzy
 msgid "Automatic"
 msgstr "Tria autom�tica"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Filename:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 #, fuzzy
 msgid "Select a file"
 msgstr "Fitxer de signatura:"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 #, fuzzy
 msgid "File type:"
 msgstr "Nom del fitxer:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "S'est� movent"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 #, fuzzy
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -26693,9 +26909,14 @@ msgstr "S'estan escanejant les carpetes de \"%s\""
 msgid "in \"%s\" ..."
 msgstr "Obre a %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "No es pot crear la carpeta indicada:\n"
 "%s"
@@ -26714,8 +26935,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nou"
@@ -26759,59 +26980,59 @@ msgstr "V�s a la carpeta..."
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 #, fuzzy
 msgid "Work Offline"
 msgstr "S'est� movent"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "(Sense nom)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26819,12 +27040,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No es pot configurar l'emmagatzemament local -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26832,33 +27053,33 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 #, fuzzy
 msgid "Cannot register on OAF"
 msgstr "No es pot registrar l'emmagatzemament amb l'int�rpret d'ordres"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configuraci� del correu"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Error gen�ric"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26867,121 +27088,131 @@ msgstr ""
 "Esteu segur que voleu eliminar el grup\n"
 "`%s' de la barra de dreceres?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "No l'eliminis"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Icones _petites"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra les dreceres com a icones petites"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Icones _grans"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra les dreceres com a icones grans"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nou grup..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Crea un nou grup de dreceres"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "_Elimina aquest grup..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Crea un nou grup de dreceres"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Crea un nou grup de dreceres"
+
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "Obre'l en una nova finestra"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Envia aquest missatge"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "Nom de la regla: "
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Elimina aquest grup de dreceres"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "Elimina"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mostra la barra de _dreceres"
@@ -26990,56 +27221,56 @@ msgstr "Mostra la barra de _dreceres"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no �s v�lid"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funci� no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operaci� no suportada"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "No es pot bifurcar %s: %s"
@@ -27084,74 +27315,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "adjunci�"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "Cap"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Detecta els tipus suportats..."
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Consulta cancel�lada per l'usuari."
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "Error d'E/S"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "S_urt"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Agenda"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "La carpeta `%s' no existeix."
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "S'ha rebut el missatge"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -27178,6 +27409,26 @@ msgstr "Hores"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Agenda"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Contactes..."
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correu"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tasques"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -27193,6 +27444,34 @@ msgstr "Carpetes"
 msgid "Specify where to create the folder:"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "_Crea una carpeta nova..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nom del fitxer:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Servidor:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nom d'usuari:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -27288,16 +27567,16 @@ msgstr "Envia aquest missatge"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Par�metres"
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -27338,7 +27617,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27347,47 +27626,47 @@ msgstr ""
 "Gr�cies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Envia aquest missatge"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "No es pot inicialitzat l'int�rpret d'ordres de l'Evolution."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Data d'_inici:"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
@@ -27429,135 +27708,127 @@ msgstr "_Inverteix la selecci�"
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:6
-#, fuzzy
-msgid "Create new contact"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-addressbook.xml.h:7
-#, fuzzy
-msgid "Create new contact list"
-msgstr "Crea un nou contacte"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 #, fuzzy
 msgid "Cut the selection"
 msgstr "_Inverteix la selecci�"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Previsualitzaci� d'impressi�"
+
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Atura la c�rrega"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "l'hora actual"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "_Contactes..."
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contactes..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Desa com a VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 #, fuzzy
 msgid "_Select All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "FIXME: Nou _missatge per contactar"
@@ -27610,12 +27881,6 @@ msgstr "Mes"
 msgid "Previews the calendar to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-#, fuzzy
-msgid "Print Pre_view"
-msgstr "Previsualitzaci� d'impressi�"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -27653,7 +27918,7 @@ msgstr "Setmanes"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
 msgstr "Tanca"
@@ -27668,7 +27933,7 @@ msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -27681,8 +27946,8 @@ msgstr "Previsualitza el missatge que s'ha d'imprimir"
 msgid "Print this item"
 msgstr "Imprimeix aquest element"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Desa"
 
@@ -27709,9 +27974,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -27722,7 +27987,7 @@ msgstr "Imprimeix el missatge..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
 msgid "Save _As..."
 msgstr "Anomena i desa..."
@@ -27738,8 +28003,8 @@ msgstr "FIXME: Nou _missatge per contactar"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Desa"
 
@@ -27852,29 +28117,39 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Mou un missatge a una nova carpeta"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Redacta un nou missatge"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Copia el missatge a una nova carpeta"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Filters..."
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Previsualitzaci�:"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "S'estan escanejant les carpetes de \"%s\""
@@ -27987,7 +28262,7 @@ msgstr "Llista de missatges en cadena"
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Carpeta"
 
@@ -28281,206 +28556,221 @@ msgstr "Carrega un missatge desat anteriorment"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Respon"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Comprova si hi ha nou correu"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Carrega un missatge desat anteriorment"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Anomena i desa..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "Font del correu"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Cerca completa"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Comprova si hi ha nou correu"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Adjunta un fitxer al missatge"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Filtre sobre la llista de correu"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "VFolder sobre l'assumpte"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Adjunta"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Reenvia el missatge"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "V�s a"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Visualitza en l�nia"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "Busca"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "Esborra la visualitzaci� del missatge"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Normal Display"
 msgstr "_Visualitzaci�"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Open Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Imprimeix el missatge"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cap"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Tanca..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Eines"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 #, fuzzy
 msgid "Close this window"
 msgstr "Suprimeix aquesta cita"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Visualitza"
 
@@ -28512,198 +28802,184 @@ msgstr ""
 msgid "For_mat"
 msgstr "Format"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
 #, fuzzy
-msgid "Inline Text _File..."
-msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Insereix un fitxer com a text dins del missatge"
-
-#: ui/evolution-message-composer.xml.h:12
-#, fuzzy
-msgid "Insert text file..."
-msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#: ui/evolution-message-composer.xml.h:13
-#, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "Save As"
 msgstr "_Anomena i desa"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "l'hora actual"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Send"
 msgstr "_Envia"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send _Later"
-msgstr "Remitent"
-
-#: ui/evolution-message-composer.xml.h:29
-#, fuzzy
-msgid "Send _later"
-msgstr "Remitent"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-#, fuzzy
-msgid "Send the message later"
-msgstr "Envia aquest missatge"
-
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Send this message now"
+msgid "Send this message"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Mostra/amaga les adjuncions"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Show attachments"
 msgstr "Mostra les _adjuncions"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "S'est� enviant el missatge sense cap asuumpte"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S'est� enviant el missatge sense cap asuumpte"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "_Attachment..."
 msgstr "adjunci�"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "_Bcc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_Cc Field"
 msgstr "Camps"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "_Delete all"
 msgstr "_Suprimeix"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 #, fuzzy
 msgid "_Insert"
 msgstr "_�ndex"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "_Obre..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Respon"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Desa el contacte i tanca el quadre de di�leg"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Ajuda"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Fitxer de signatura"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Afegeix una carpeta a la llista de carpetes a qu� estic subscrit"
@@ -28811,196 +29087,226 @@ msgid "Add to _Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Instal�laci� de l'Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "Copy this folder"
 msgstr "Copia a la carpeta"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Create _New Folder..."
 msgstr "_Crea una carpeta nova..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 #, fuzzy
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Elimina aquesta drecera de la barra de dreceres"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Create a new folder"
 msgstr "Creaci� d'una nova carpeta"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Crea un nou grup de dreceres"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Creaci� d'una nova carpeta"
+
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Suprimeix aquest element"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostra una altra carpeta"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "S_urt"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "_Crea una carpeta nova..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Obre'l en una nova finestra"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 #, fuzzy
 msgid "Open this folder in an other window"
 msgstr "Envia aquest missatge"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Par�metres"
+
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configuraci� del correu"
+
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informaci� referent a l'Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "Submit Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error mitjan�ant el Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 #, fuzzy
 msgid "Toggle"
 msgstr "M�bil"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaci� o no de la barra de dreceres"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "Commuta la visualitzaci� o no de la barra de carpetes"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Visualitza la carpeta seleccionada"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copia"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Carpeta"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_V�s a la carpeta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "S'est� movent"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Move..."
 msgstr "Mou"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_New Folder"
 msgstr "Nova VFolder"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "_Par�metres"
+msgid "_Preferences..."
+msgstr "Prefer�ncies"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Tanca..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Sendmail"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:59
 #, fuzzy
-msgid "_Shortcut"
+msgid "_Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:60
 #, fuzzy
-msgid "_Shortcut Bar"
+msgid "_Shortcut..."
 msgstr "Mostra la barra de _dreceres"
 
 #: ui/my-evolution.xml.h:3
@@ -29020,19 +29326,39 @@ msgstr "Reconstrueix la visualitzaci� del missatge"
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
-msgid "Address Cards"
-msgstr "Adre�a"
+msgid "By _Company"
+msgstr "Empresa"
 
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "Empresa"
+msgid "_Address Cards"
+msgstr "Adre�a"
 
 #: views/addressbook/galview.xml.h:3
 #, fuzzy
-msgid "Phone List"
+msgid "_Phone List"
 msgstr "Tipus de tel�fon"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Setmana"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Cotxe"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Mes"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Setmana de treball"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -29062,14 +29388,19 @@ msgstr "Assumpte"
 msgid "Messages"
 msgstr "_Missatge"
 
-#: views/tasks/galview.xml.h:2
+#: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With Category"
+msgid "With _Category"
 msgstr "categories"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "Tasca"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -29232,12 +29563,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 #, fuzzy
 msgid "Search Editor"
 msgstr "Contacta l'editor"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 #, fuzzy
 msgid "Save Search"
 msgstr "Cerca"
@@ -29283,22 +29614,22 @@ msgstr "_Missatge"
 msgid "Don't show this message again."
 msgstr "Envia aquest missatge"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "finestra2"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Find Now"
 msgstr "finestra2"
@@ -29314,22 +29645,136 @@ msgstr "Afegeix una font"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "Mou"
+
+#, fuzzy
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Suprimeix aquesta cita"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr "Assumpte"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Error d'E/S"
+
+#, fuzzy
+#~ msgid "Insert File"
+#~ msgstr "FIXME: Insereix el fitxer..."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "La data del missatge es comparar� amb l'hora,\n"
+#~ "sigui quina sigui, en qu� s'executi el filtre\n"
+#~ "o s'obri la vfolder."
+
+#, fuzzy
+#~ msgid "Evolution News Editor"
+#~ msgstr "Conducte de les coses per fer de l'Evolution"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#, fuzzy
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Cal que configureu una identitat\n"
+#~ "abans de poder redactar correu."
+
+#, fuzzy
+#~ msgid "NNTP Server:"
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Edita el servidor de not�cies"
+
+#~ msgid "Source"
+#~ msgstr "Font"
+
+#, fuzzy
+#~ msgid "Source Information"
+#~ msgstr "Cap informaci�"
+
+#, fuzzy
+#~ msgid "newswindow1"
+#~ msgstr "finestra1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Desa al disc..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Anomena i desa..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Crea una nova carpeta"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "El tipus de la carpeta seleccionada no �s v�lid per a\n"
+#~ "l'operaci� sol�licitada."
+
+#, fuzzy
+#~ msgid "_Contact List"
+#~ msgstr "_Contactes..."
+
+#, fuzzy
+#~ msgid "Inline Text _File..."
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insereix un fitxer com a text dins del missatge"
+
+#, fuzzy
+#~ msgid "Insert text file..."
+#~ msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Remitent"
+
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Remitent"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Envia aquest missatge"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Par�metres"
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Afegeix una font"
 
@@ -29450,10 +29895,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Cancel�lat"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Fitxer de signatura:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Fitxer de signatura:"
 
@@ -29650,13 +30091,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_M�bil"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crea una nova cita"
-
-#, fuzzy
-#~ msgid "Create a new task"
-#~ msgstr "Crea un nou contacte"
-
 #, fuzzy
 #~ msgid "New _Task"
 #~ msgstr "Tasca"
@@ -29729,9 +30163,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ "Aix� us connectar� al servidor POP i utilitzar� el Kerberos 4 per "
 #~ "autenticar-vos-hi."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
-
 #, fuzzy
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "No s'ha pogut connectar al servidor POP en %s."
@@ -29764,10 +30195,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "el o abans del"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "No s'ha pogut connectar al servidor POP en %s."
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "FIXME: Missatge de _correu"
 
@@ -29806,10 +30233,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgstr "Organitzaci�:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "Desa com a VCard"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Envia els missatges en format HTML"
 
@@ -30861,9 +31284,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "Create a new email"
 #~ msgstr "Crea un nou contacte"
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copia el missatge a una nova carpeta"
-
 #, fuzzy
 #~ msgid "Forward this message in-line with your mail, so you can edit it"
 #~ msgstr "Reenvia un missatge sense cap assumpte"
@@ -31602,9 +32022,6 @@ msgstr "No s'ha pogut inicialitzar el Bonobo"
 #~ msgid "_Open in New Window"
 #~ msgstr "_Obre'l en una nova finestra"
 
-#~ msgid "_Print Message"
-#~ msgstr "_Imprimeix el missatge"
-
 #, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Font"
diff --git a/po/cs.po b/po/cs.po
index 3fedff6171..41cad0af84 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-11 19:06-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-15 17:59-0400\n"
 "Last-Translator: Radka Doul�kov� <doulikova@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Nelze spustit Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Vyhled�v�m..."
 
@@ -356,31 +356,31 @@ msgstr "Po_loha..."
 msgid "Error in search expression."
 msgstr "Chyba v hledan�m v�razu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "P�id�v�m kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Odstra�uji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Upravuji kartu ze serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Znovu spou�t�m vyhled�v�n�."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "P�ij�m�m v�sledky hled�n� LDAP"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Chyba p�i prov�d�n� hled�n�"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr ""
 
@@ -471,11 +471,11 @@ msgstr ""
 "Tato str�nka se pou��v� pro nastaven� p��stupu k adres���m LDAP server�"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1085
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -491,31 +491,30 @@ msgstr "Server LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP obsahuj�c� kontaktn� informace"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "Nov� seznam kontakt�"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "_Seznam kontakt�"
-
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Create a new contact list"
-msgstr "Vytvo�it nov� seznam kontakt�"
-
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nov� kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:584
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:585
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Vytvo�it nov� kontakt"
 
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Nov� seznam kontakt�"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "_Seznam kontakt�"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "Vytvo�it nov� seznam kontakt�"
+
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -557,11 +556,11 @@ msgstr "Nelze spustit gnome-vfs"
 msgid "Other Contacts"
 msgstr "Dal�� kontakty"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nelze otev��t adres��"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -570,7 +569,7 @@ msgstr ""
 "Nen� mo�n� otev��t tento adres��. To znamen�,\n"
 "�e jste zadali nespr�vn� URI nebo �e server LDAP spadl"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -578,48 +577,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Napi�te heslo pro  %s (u�ivatel %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Jm�no za��n� na"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-mail je"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jak�koliv pol��ko obsahuje"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Pokro�il�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Jak�koliv kategorie"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kterou prohl��e� slo�ek zobraz�"
 
@@ -736,7 +735,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Zdroje adres��e"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "V�dy"
@@ -821,7 +820,7 @@ msgstr ""
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
 #: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nikdy"
@@ -872,8 +871,8 @@ msgstr "_Rozsah vyhled�v�n�: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Vyhled�v�n�"
 
@@ -1061,15 +1060,15 @@ msgid "Using email address"
 msgstr "Pou�it� e-mailov� adresy"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:136
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_P�idat"
 
@@ -1109,12 +1108,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "_Omezen� stahov�n�"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:151 ui/evolution-addressbook.xml.h:37
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_�pravy"
@@ -1217,9 +1216,9 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstranit"
@@ -1249,32 +1248,14 @@ msgstr "<(%d nezobrazeno)"
 msgid "Unnamed Contact"
 msgstr "Nepojmenovan� kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid "Find contact in"
-msgstr "Naj�t kontakt v"
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "Vyberte kontakty z adres��e"
 
+#: addressbook/gui/component/select-names/e-select-names.c:544
+msgid "Find contact in"
+msgstr "Naj�t kontakt v"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Vybrat jm�na"
@@ -1296,14 +1277,10 @@ msgstr ""
 "vyberte z uveden�ho seznamu:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Slo�ka:"
 
@@ -1406,11 +1383,12 @@ msgstr "Chce dost�vat po�tu v _HTML form�tu"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1724
-#: mail/mail-config.glade.h:149 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:46
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Smazat"
 
@@ -2646,7 +2624,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skr�t adresy p�i pos�l�n� e-mailu do tohoto seznamu"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Odstranit"
 
@@ -2709,7 +2687,7 @@ msgstr ""
 "P�ejete si jej p�esto p�idat?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Pokro�il� vyhled�v�n�"
 
@@ -2736,21 +2714,21 @@ msgid "Error getting book view"
 msgstr "Chyba p�i z�sk�v�n� n�hledu knihy"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Chyba p�i �prav� karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�sp�ch"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:512 shell/e-shell.c:2170
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1123
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Nezn�m� chyba"
 
@@ -2758,8 +2736,8 @@ msgstr "Nezn�m� chyba"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1114
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "P��stup zam�tnut"
 
@@ -2776,7 +2754,7 @@ msgid "Protocol not supported"
 msgstr "Protokol nen� podporov�n"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2797,46 +2775,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "neexistuje"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Jin� chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "P�ejete si ulo�it zm�ny?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Chyba p�i p�id�v�n� seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Chyba p�i p�id�v�n� karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Chyba p�i �prav� seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Chyba p�i odstra�ov�n� seznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Chyba p�i odstra�ov�n� karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Zobrazit karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Zobrazit karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2846,19 +2829,19 @@ msgstr ""
 "Po�adujete zobrazen� %d karet. T�m se zobraz� %d nov�ch oken na Va�� "
 "obrazovce. Opravdu si p�ejete zobrazit v�echny tyto karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "P�esunout kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kop�rovat kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "P�esunout karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kop�rovat karty do"
 
@@ -2930,7 +2913,7 @@ msgstr "Adres��"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ulo�it jako VCard"
 
@@ -2963,7 +2946,7 @@ msgid "Pilot Settings..."
 msgstr "P�edb�n� nastaven�..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "P�eposlat kontakt"
 
@@ -2972,8 +2955,8 @@ msgid "Send Message to Contact"
 msgstr "Poslat zpr�vu pro kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tisknout"
@@ -2991,7 +2974,7 @@ msgid "Move to folder..."
 msgstr "P�esunout do slo�ky..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vy��znout"
 
@@ -3002,20 +2985,20 @@ msgid "Copy"
 msgstr "Kop�rovat"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vlo�it"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Smazat"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr "Aktu�ln� n�hled"
 
@@ -3269,26 +3252,26 @@ msgstr "Neozna�en� ud�lost"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Vysok�"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Norm�ln�"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "N�zk�"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinov�no"
@@ -3406,11 +3389,11 @@ msgstr "Doba odlo�en� (minut)"
 msgid "_Edit appointment"
 msgstr "_Upravit ud�lost"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Popis nen� dostupn�."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3422,13 +3405,13 @@ msgstr ""
 "vytvo�ena k posl�n� e-mailu. Evolution nam�sto toho\n"
 "zobraz� dialogov� okno pro b�nou p�ipom�nku."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2605
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varov�n�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3445,7 +3428,7 @@ msgstr ""
 "\n"
 "Opravdu chcete spustit tento program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "P���t� se neptat na tento program."
 
@@ -3473,7 +3456,7 @@ msgstr "Popis obsahuje"
 msgid "Comment contains"
 msgstr "Koment�� obsahuje"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1090
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Nep�i�azen�"
 
@@ -3484,7 +3467,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3506,17 +3489,19 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
-msgstr "Nelze vytvo�it n�hled kalend��e. Zkontrolujte, pros�m, va�e nastaven� ORBit a OAF."
+msgstr ""
+"Nelze vytvo�it n�hled kalend��e. Zkontrolujte, pros�m, va�e nastaven� ORBit "
+"a OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Soukrom�"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "D�v�rn�"
@@ -3541,37 +3526,37 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Voln�"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Obsazen�"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Neza�ato"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Prob�h�"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokon�eno"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3582,34 +3567,33 @@ msgstr ""
 "\"45.436845,125.862501\""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1902
-#: mail/folder-browser.c:1686 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:455
-#: mail/mail-accounts.c:464 mail/mail-config.glade.h:77
-#: mail/message-tag-followup.c:67
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "��dn�"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Opakovan�"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "P�i�azeno"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ano"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ne"
 
@@ -3630,8 +3614,8 @@ msgid "Month View"
 msgstr "M�s��n� n�hled"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1077
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalend��"
 
@@ -3639,12 +3623,12 @@ msgstr "Kalend��"
 msgid "Folder containing appointments and events"
 msgstr "Slo�ka obsahuj�c� ud�losti"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1081
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�koly"
 
@@ -3652,54 +3636,54 @@ msgstr "�koly"
 msgid "Folder containing to-do items"
 msgstr "Slo�ka obsahuj�c� polo�ky \"ud�lat\""
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nov� ud�lost"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Ud�lost"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Vytvo�it novou ud�lost"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nov� sch�zka"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Sch�zka"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 msgid "Create a new meeting request"
 msgstr "Vytvo�it po�adavek na novou sch�zku"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nov� �kol"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "�_kol"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "Vytvo�it nov� �kol"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "Nov� celodenn� ud�lost"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "_Celodenn� ud�lost"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 msgid "Create a new all-day appointment"
 msgstr "Vytvo�it novou celodenn� ud�lost"
 
-#: calendar/gui/component-factory.c:721
-msgid "New appointment"
-msgstr "Nov� ud�lost"
-
-#: calendar/gui/component-factory.c:721
-msgid "_Appointment"
-msgstr "_Ud�lost"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "Vytvo�it novou ud�lost"
-
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3765,7 +3749,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "S t�mito parametry:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "den/dny/dn�"
 
@@ -3773,11 +3758,13 @@ msgstr "den/dny/dn�"
 msgid "extra times every"
 msgstr "kr�t nav�c ka�d�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "hodinu/-y"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut(-u,-y)"
 
@@ -3905,7 +3892,7 @@ msgstr "P�ipom�nky"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Shrnut�"
 
@@ -3934,7 +3921,7 @@ msgstr "skon�en�(-m) ud�losti"
 msgid "hour(s)"
 msgstr "hodin(-u,-y)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut(-u,-y)"
 
@@ -4107,7 +4094,7 @@ msgid "_Fri"
 msgstr "p_�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "O_becn�"
 
@@ -4147,19 +4134,33 @@ msgstr "_st"
 msgid "before every appointment"
 msgstr "p�ed ka�dou ud�lost�"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Stav sch�zky se zm�nil. Poslat aktualizovanou verzi?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Opravdu chcete zru�it a smazat tuto sch�zku?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Opravdu chcete zru�it a smazat tento �kol?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Opravdu chcete zru�it a smazat tento z�pis v den�ku?"
 
@@ -4227,59 +4228,59 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Nelze aktualizovat neplatn� objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Nelze aktualizovat objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Upravit ud�lost"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ud�lost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�kol - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Z�pis v den�ku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nen� shrnut�"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3721 composer/e-msg-composer.c:1016
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Ulo�it jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nen� mo�n� z�skat aktu�ln� verzi!"
 
@@ -4478,7 +4479,7 @@ msgid "Member"
 msgstr "�len"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4490,7 +4491,7 @@ msgstr "Funkce"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4572,7 +4573,7 @@ msgstr ""
 msgid "first"
 msgstr "1."
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "2."
 
@@ -4592,7 +4593,7 @@ msgstr "posledn�"
 msgid "Other Date"
 msgstr "Dal�� data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "den"
 
@@ -4690,20 +4691,26 @@ msgstr "% dokon�eno"
 msgid "Date Completed:"
 msgstr "Datum dokon�en�:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Pr�b�h"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Nal�havost:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stav:"
 
@@ -4717,7 +4724,7 @@ msgstr "Z�kladn�"
 msgid "Assignment"
 msgstr "P�ed�n�"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4786,76 +4793,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3479 mail/folder-browser.c:1697
-#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otev��t"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Ulo�it jako..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3453 calendar/gui/e-week-view.c:3481
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tisknout..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3486 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3487 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kop�rovat"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3457
-#: calendar/gui/e-week-view.c:3488 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "V_lo�it"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "P_�edat �kol"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "_Odeslat jako i-kalend��"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Ozna�it jako _dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ozna�it _vybran� �koly jako dokon�en�"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Smazat vybran� �koly"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7434
-#: calendar/gui/e-week-view.c:4202
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknout pro p�id�n� �kolu"
@@ -4864,8 +4871,8 @@ msgstr "Kliknout pro p�id�n� �kolu"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Dokon�it"
 
@@ -4894,8 +4901,8 @@ msgid "Start Date"
 msgstr "Za��tek"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:778
-#: shell/e-shortcuts.c:1069
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "P�ehled"
 
@@ -4937,104 +4944,104 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nov� _ud�lost"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3447
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nov� _celodenn� ud�lost"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3448
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "Nov� sch�zka"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nov� �kol"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tisk..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "J�t na _dne�ek"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_J�t na datum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3468
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Zve�ejnit informaci o voln�m/obsazen�m �ase"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Nastavit..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3480
-#: mail/folder-browser.c:1699 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Ulo�it jako..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "Napl�novat _Sch�zku..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako i-kalend��..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3498
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3500
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3849
-#: shell/e-shell-view-menu.c:660
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3855
-#: shell/e-shell-view-menu.c:668
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5075,7 +5082,7 @@ msgstr "�kol spln�n: <b>"
 msgid "Task Due: <b>"
 msgstr "Term�n spln�n� �kolu: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Informace i-kalend��e"
 
@@ -5084,12 +5091,12 @@ msgstr "Informace i-kalend��e"
 msgid "iCalendar Error"
 msgstr "Chyba i-kalend��e"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Nezn�m� osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5097,317 +5104,322 @@ msgstr ""
 "Prohl�dn�te si, pros�m, n�sleduj�c� informaci a pot� vyberte akci z uveden� "
 "nab�dky"
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_M�sto:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nezn�m�"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2160 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Pokles"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Poslat nejnov�j�� informace"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informace o sch�zce"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Zru�en� sch�zky"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Aktualizovat �kol"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Zpr�va o �patn�m �kolu"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "P��loha neobsahuje platnou zpr�vu kalend��e"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr "Nem�te pr�va k aktualizaci kalend��e\n"
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Soubor kalend��e nem��e b�t aktualizov�n!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Polo�ka odesl�na!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Polo�ka nem��e b�t odesl�na!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr "Vybrat slo�ku kalend��"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr "Vybrat slo�ku �koly"
 
@@ -5452,7 +5464,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr ""
 
@@ -5465,57 +5477,52 @@ msgid "Non-Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Skupina"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr ""
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "P�edb�n�"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr ""
 
@@ -5605,46 +5612,43 @@ msgstr "_Za��tek sch�zky:"
 msgid "Meeting _end time:"
 msgstr "_Konec sch�zky:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nov� _ud�lost..."
 
-#: calendar/gui/e-week-view.c:3497
-msgid "_Delete this Appointment"
-msgstr "_Zru�it tuto ud�lost"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5655,11 +5659,15 @@ msgstr "Nelze otev��t slo�ku v `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1963
+msgid "Opening default tasks folder"
+msgstr ""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "duben"
@@ -5716,47 +5724,47 @@ msgstr "��jen"
 msgid "September"
 msgstr "z���"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Informace o ud�losti"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informace o �kolu"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informace o den�ku"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informace o kalend��i"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Aktualizov�no"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
@@ -5991,7 +5999,7 @@ msgid "Print Calendar"
 msgstr "Tisknout kalend��"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2892
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Prohl�dnout p�ed tiskem"
@@ -6021,8 +6029,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2377
-#: mail/mail-callbacks.c:2619
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "P���t� se neptat."
 
@@ -6074,15 +6082,27 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nelze z�skat zpr�vu: %s ze slo�ky %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr "P�ipom�nka!!"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr "Ud�losti kalend��e"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6090,111 +6110,111 @@ msgstr ""
 "Evolution na�la soubory kalend��e Gnome.\n"
 "Chcete je importovat do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "Kalend�� Gnome"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7781,71 +7801,79 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nelze otev��t zpr�vu"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7986,22 +8014,22 @@ msgid "Could not lock '%s'"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8060,11 +8088,11 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:286
+#: camel/camel-multipart-encrypted.c:287
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
@@ -8188,7 +8216,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8355,26 +8383,127 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "_Vytvo�it podpis"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Chyba p�i p�id�v�n� seznamu"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Mimo kancel��"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nelze obdr�et zpr�vu z editoru"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Invalid purpose"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8383,16 +8512,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8407,17 +8548,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:616
+#: camel/camel-vee-folder.c:618
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:801 camel/camel-vee-folder.c:807
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -8444,12 +8585,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8478,40 +8619,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Tato zpr�va nen� pr�v� dostupn�"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8520,10 +8661,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -8536,7 +8677,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1047
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Soubory"
 
@@ -8574,68 +8715,73 @@ msgstr "Heslo"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Spojen� zru�eno"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nelze spojit s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nepoda�ilo se spojit s IMAP serverem %s v bezpe�en�m modu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Slo�ka nen� pr�zdn�"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s nepodporuje po�adovan� typ ov��en� %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Typ ov��en� %s nen� podporov�n"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sUve�te IMAP heslo pro %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Neuvedli jste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8646,31 +8792,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodi�ovsk� slo�ka nem��e obsahovat podslo�ky"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s p�i %s"
@@ -8692,7 +8844,9 @@ msgid "Local delivery"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8718,12 +8872,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8734,38 +8888,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nelze z�skat slo�ku: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nelze p�ejmenovat slo�ku %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nelze p�ejmenovat '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -8825,7 +8979,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8863,24 +9017,24 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr ""
@@ -8924,7 +9078,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -8933,7 +9087,7 @@ msgstr ""
 "Nelze otev��t soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -8942,14 +9096,14 @@ msgstr ""
 "Nelze vytvo�it soubor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nen� obvykl� soubor."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -8958,7 +9112,7 @@ msgstr ""
 "Nelze smazat slo�ku `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Slo�ka `%s' nen� pr�zdn�, nebyla tud�� smaz�na."
@@ -8973,64 +9127,64 @@ msgstr "Nelze otev��t slo�ku: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nelze otev��t soubor: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nelze p�ejmenovat slo�ku: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezn�m� chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9176,47 +9330,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Na��t�m shrnut� POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "U�ivatel zru�en"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nelze z�skat shrnut� POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Na��t�m POP zpr�vu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nelze z�skat zpr�vu %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Nezn�m� d�vod"
 
@@ -9277,7 +9431,9 @@ msgstr "Nen� mo�n� spojit se s POP serverem %s"
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
-msgstr "Nelze se spojit s POP serverem %s: Po�adovan� mechanismus ov��en� nen� podporov�n."
+msgstr ""
+"Nelze se spojit s POP serverem %s: Po�adovan� mechanismus ov��en� nen� "
+"podporov�n."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
@@ -9299,8 +9455,8 @@ msgstr "Nepoda�ilo se ov��en� na POP serveru %s: %s"
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s Uve�te POP heslo pro %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:510
-#: camel/providers/pop3/camel-pop3-store.c:515
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9309,13 +9465,13 @@ msgstr ""
 "Nen� mo�n� spojit se s POP serverem %s.\n"
 "Chyba p�i pos�l�n� hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:608
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9339,35 +9495,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nelze poslat zpr�vu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9475,41 +9631,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr "Je po�adov�no ov��en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nepoda�ilo se spojit se SMTP serverem %s v bezpe�n�m modu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr "server pravd�podobn� nepodporuje SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s nepodporuje po�adovan� typ ov��en� %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sUve�te SMTP heslo pro %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9520,88 +9675,87 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "Zpr�vu nelze poslat: adresa odes�latele je neplatn�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Pos�l�m zpr�vu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nelze poslat zpr�vu: nebyli ur�eni p��jemci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nelze poslat zpr�vu: jeden nebo v�ce neplatn�ch p��jemc�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO request timed out: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:913
+msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP ov��en�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1168
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9609,86 +9763,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1182
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1222
-#: camel/providers/smtp/camel-smtp-transport.c:1240
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1254
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1291
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1314
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1328
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "priloha"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -9706,71 +9860,85 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr ""
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Od:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Odpov�d�t&nbsp;komu:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "P�edm�t:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Vyplnit p��jemce zpr�vy"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vypl�te adresy, kter� obdr�� kopii t�to zpr�vy."
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Skryt� kopie:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "Vypl�te adresy, kter� obdr�� kopii, ani� by se objevily v seznamu p��jemc� zpr�vy."
+msgstr ""
+"Vypl�te adresy, kter� obdr�� kopii, ani� by se objevily v seznamu p��jemc� "
+"zpr�vy."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "J�t na"
 
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "P�ipojit soubor"
 
-#: composer/e-msg-composer.c:505
+#: composer/e-msg-composer.c:514
 msgid "Could not create a PGP signature context"
 msgstr ""
 
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9779,116 +9947,112 @@ msgstr ""
 "Chyba p�i �ten� souboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1025
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Varov�n�!"
 
-#: composer/e-msg-composer.c:1029
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Soubor existuje, p�epsat?"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba p�i ukl�d�n� souboru: %s"
 
-#: composer/e-msg-composer.c:1070
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1101
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba p�i p��stupu k souboru: %s"
 
-#: composer/e-msg-composer.c:1109
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nelze obdr�et zpr�vu z editoru"
 
-#: composer/e-msg-composer.c:1116
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1123
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1132
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1232
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1378
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1385
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1417
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Otev��t soubor"
 
-#: composer/e-msg-composer.c:1555
-msgid "Insert File"
-msgstr "Vlo�it soubor"
-
-#: composer/e-msg-composer.c:1825
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1862
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr "Podpis:"
 
-#: composer/e-msg-composer.c:1903 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr "automatick�"
 
-#: composer/e-msg-composer.c:1915
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr "nastavit jako v�choz�"
 
-#: composer/e-msg-composer.c:2092 composer/e-msg-composer.c:2697
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2714
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2740 composer/e-msg-composer.c:2795
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3620
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -9950,8 +10114,8 @@ msgstr "P�edm�t obsahuje"
 msgid "Subject does not contain"
 msgstr "P�edm�t neobsahuje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2242
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -9959,12 +10123,11 @@ msgstr ""
 "Soubor s t�mto n�zvem ji� existuje.\n"
 "P�ejete si ho p�epsat?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Zapamatujte si toto heslo"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10062,250 +10225,271 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "rok"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "roky/let"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "vte�in�(-�ch)"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�s�c"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minutu"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "m�s�ce/-�"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hodinu"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "t�den"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "t�dny/-�"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "hodinu"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�s�c"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minutu"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "m�s�ce/-�"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "vte�in�(-�ch)"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "rok"
 
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr ""
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "roky/let"
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Datum zpr�vy bude porovn�v�no s �asem,\n"
-"kdy bude spu�t�n filtr nebo\n"
-"bude otev�ena Vslo�ka."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<pro v�b�r data kliknout sem>"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Datum zpr�vy bude porovn�v�no \n"
-"s �asem, kter� ur��te zde."
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "nyn�"
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+msgid "%d-%b-%Y"
 msgstr ""
-"Datum zpr�vy bude porovn�v�no s �asem \n"
-"vztahuj�c�m se k okam�iku, kdy bude spu�t�n filtr;\n"
-"(nap�. \"t�den nazp�t\"). "
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "se sou�asn�m �asem"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "s �asem, kter� ur��te"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "s �asem vztahuj�c�m se k sou�asn�mu �asu"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " nazp�t"
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 msgid "Select a time to compare against"
 msgstr "Vybrat �as pro porovn�n�"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Porovnat"
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "nyn�"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " nazp�t"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "nazp�t"
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %k:%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<pro v�b�r data kliknout sem>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:188
+#: filter/filter-file.c:190
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:288
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr "Vybrat soubor"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "P�idat akci"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "D�le�it�"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr "Pracovn�"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr "Osobn�"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
+msgstr "Ud�lat"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr "Pozd�ji"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test1"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "N�zev pravidla: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Bez n�zvu"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Pokud"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Prov�st akce"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "pokud souhlas� v�echna krit�ria"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "pokud souhlas� n�kter� krit�ria"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "P�idat krit�rium"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "p��choz�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "odchoz�"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Porovnat"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editovat filtry"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editovat Vslo�ky"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "P��choz�"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Odchoz�"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum zpr�vy bude porovn�v�no \n"
+"s �asem, kter� ur��te zde."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum zpr�vy bude porovn�v�no s �asem \n"
+"vztahuj�c�m se k okam�iku, kdy bude spu�t�n filtr;\n"
+"(nap�. \"t�den nazp�t\"). "
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum zpr�vy bude porovn�v�no \n"
+"s �asem, kter� ur��te zde."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtu�ln� slo�ky"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "s �asem vztahuj�c�m se k sou�asn�mu �asu"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "nazp�t"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "se sou�asn�m �asem"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "s �asem, kter� ur��te"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10331,41 +10515,42 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
-msgstr "P��kaz"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "obsahuje"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kop�rovat do slo�ky"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Datum p�ijet�"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Datum odesl�n�"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Smaz�no"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nekon�� na"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "neexistuje"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neexistuje"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nezn� jako"
@@ -10387,87 +10572,83 @@ msgid "ends with"
 msgstr "kon�� na"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existuje"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "V�raz"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "D�le�it�"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "je p�ed"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nen�"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1734
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Po�tovn� konference"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "T�lo zpr�vy"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "P�esunout do slo�ky"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Poslat zpr�vu pro kontakt"
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "��st"
 
@@ -10483,57 +10664,84 @@ msgstr ""
 msgid "Replied to"
 msgstr "Odpov�zeno komu:"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sk�re"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1549
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Odes�latel"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "P��kaz"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "za��n� na"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "P�edm�t"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Spojen� St�ty"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravidla"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "P�idat pravidlo"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Upravit pravidlo"
 
@@ -10541,11 +10749,11 @@ msgstr "Upravit pravidlo"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10553,31 +10761,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:315
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Po�ta"
 
@@ -10634,37 +10842,37 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1076
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Ko�"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 msgid "Scanning mail filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Nastaven�"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10788,66 +10996,81 @@ msgstr "Vlastnosti..."
 msgid "Change this folder's properties"
 msgstr "Zm�nit vlastnosti t�to slo�ky"
 
-#: mail/component-factory.c:759
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:921
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "M�te neodeslan� zpr�vy, chcete p�esto skon�it?"
 
-#: mail/component-factory.c:949
+#: mail/component-factory.c:956
 msgid "Warning: Unsent Messages"
 msgstr "Varov�n�: Neposlan� zpr�vy"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nov� dopis"
 
-#: mail/component-factory.c:990 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Dopis"
 
-#: mail/component-factory.c:991
+#: mail/component-factory.c:998
 msgid "Compose a new mail message"
 msgstr "Napsat nov� dopis"
 
-#: mail/component-factory.c:1018
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "_n�sleduj�c� zpr�vu"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "_p�edchoz� zpr�vu"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Napsat nov� dopis"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1033
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1258 mail/component-factory.c:1288
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1299
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:428
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:430
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -10896,125 +11119,125 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1670
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1672
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1673
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1677
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtr podle _p�edm�tu"
 
-#: mail/folder-browser.c:1678
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtr podle _odes�latele"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtr podle p��je_mc�"
 
-#: mail/folder-browser.c:1680 mail/folder-browser.c:2014
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtr podle po�tovn� _konference"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Tisknout"
 
-#: mail/folder-browser.c:1704 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odpov�d�t odes�lateli"
 
-#: mail/folder-browser.c:1705 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1706 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpov�d�t _v�em"
 
-#: mail/folder-browser.c:1707
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_P�eposlat"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1713
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1717 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Ozna�it jako _p�e�ten�"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "Ozna�it jako _nep�e�ten�"
 
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Ozna�it jako _d�le�it�"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "_Ozna�it jako ned�le�it�"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1729
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "P�e_sunout do slo�ky..."
 
-#: mail/folder-browser.c:1730 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kop�rovat do slo�ky..."
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "P�idat odes�latele do _adres��e"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "Pou��t _filtry"
 
-#: mail/folder-browser.c:1746
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "Vy_tvo�it pravidlo ze zpr�vy"
 
-#: mail/folder-browser.c:2015
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "Vslo�ku podle _po�tovn� konference"
 
-#: mail/folder-browser.c:2017
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr podle po�tovn� ko_nference (%s)"
 
-#: mail/folder-browser.c:2018
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Vslo�ku podle po�tovn� _konference (%s)"
@@ -11083,19 +11306,19 @@ msgstr ""
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:158
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:128
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Jm�no u�ivatele:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -11111,28 +11334,28 @@ msgstr ""
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:371 mail/mail-accounts.c:405
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Povolit"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: mail/mail-accounts.c:534 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Jm�no ��tu"
 
-#: mail/mail-accounts.c:535 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -11141,30 +11364,30 @@ msgstr "Protokol"
 msgid "Mail to %s"
 msgstr "Poslat %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "P�edm�t je %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11172,7 +11395,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11180,20 +11403,20 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11201,108 +11424,108 @@ msgstr ""
 "Pos�l�te zpr�vu v HTML form�tu, av�ak n�sleduj� p��jemci si nep�ej� dost�vat "
 "zpr�vy v HTML form�tu:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Tato zpr�va je ur�ena pouze skryt�m p��jemc�m."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:424
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Aby mohla b�t tato zpr�va odesl�na, je nutn� ur�it p��jemce."
 
-#: mail/mail-callbacks.c:609
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:986
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "nezn�m� odes�latel"
 
-#: mail/mail-callbacks.c:990
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1430 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1432 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2086
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2111
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2150
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2190
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2235 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2289
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2291
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2362
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2369
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2612
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11310,35 +11533,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2725
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2737
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:2780
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2860
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "A4"
 
-#: mail/mail-callbacks.c:2899
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3086 mail/mail-callbacks.c:3127
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11358,7 +11581,7 @@ msgstr ""
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2768
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Beze jm�na"
 
@@ -11377,15 +11600,14 @@ msgstr "P�idat podpis"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11395,56 +11617,33 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:134
-msgid "Work"
-msgstr "Pracovn�"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:85
-msgid "Personal"
-msgstr "Osobn�"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:125
-msgid "To Do"
-msgstr "Ud�lat"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr "Pozd�ji"
-
-#: mail/mail-config.c:617
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "��et %d"
 
-#: mail/mail-config.c:2488
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2566 mail/mail-config.c:2570
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "P�ipojuji se k serveru..."
 
@@ -11768,94 +11967,99 @@ msgstr "Zapamatovat si toto _heslo"
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "O_bnovit v�choz� hodnoty"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr "Z_abezpe�en�"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr "Vybrat HTML font s pevnou ���kou"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "Vybrat pro tisk HTML font s pevnou ���kou"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr "Vybrat HTML font s prom�nlivou ���kou"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "Vybrat pro tisk HTML font s prom�nlivou ���kou"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:107 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pos�l�m e-mail"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Soubory konfigurace"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "_Druh zkratek:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr "Podpis #1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr "Podpis #2"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Up�esnit _n�zev souboru:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr "Jazyk pro kontrolu pravopisu"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr "_Kontrola pravopisu"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 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:124
+#: mail/mail-config.glade.h:125
 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 "
@@ -11865,193 +12069,193 @@ msgstr ""
 "Uveden� seznam jazyk� odpov�d� tomu, pro jak� jazyky m�te nainstalovan� "
 "slovn�k."
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:127
 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:129
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "P_rom�nliv� ���ka:"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr "_P�idat podpis"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_V�dy podepsat odchoz� zpr�vy kdy� pou��v�m tento ��et."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky vkl�dat checht�ky"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr "_P�pnout, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr "_Vy�adovat potvrzen� p�i vymaz�n� slo�ky"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 msgid "_Default signature:"
 msgstr "_V�choz� podpis:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr "_V�choz� hodnoty"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neupozor�ovat, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr "P_evn� ���ka:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Styl p�epos�lan�ch:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr "_HTML dopis"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Ozna�it zpr�vu jako p�e�tenou po"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Jm�no:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr "_Zahr�t zvuk, kdy� p�ijde nov� po�ta"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Upozornit, kdy� pos�l�m zpr�vu v HTML form�tu kontakt�m, kter� si to nep�ej�"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozornit, kdy� pos�l�m zpr�vu s pr�zdn�m pol��kem \"P�edm�t\""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr "Styl _odpov�d�:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:174 ui/evolution-message-composer.xml.h:51
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Zabezpe�en�"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr "_Pos�l�m po�tu"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Uk�zat animovan� obr�zky"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr "_Prom�nliv� ���ka:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12075,222 +12279,232 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Ulo�it p��lohu"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr ""
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:430
 msgid "Save Attachment..."
 msgstr "Ulo�it p��lohu..."
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Omezen� stahov�n�"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1830
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %k:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1831
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s p��loha"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "�patn� adresa"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Odpov�d�t komu"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Kopie"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Skryt� kopie"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "Program elektronick� po�ty"
 
-#: mail/mail-format.c:1736
-msgid "View messages..."
-msgstr "Prohl��et zpr�vy ..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 msgid "Could not create a PGP verfication context"
 msgstr ""
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, c-format
 msgid "Local folders/%s"
 msgstr "M�stn� slo�ky/%s"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12298,145 +12512,140 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pos�l�m \\\"%s\\\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pos�l�m  %d zpr�vu z %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1026
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1209
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "P�eposlan� zpr�vy"
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1324
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1393
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1487
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1538
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1781
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1893
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2012
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2271
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:507
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Vyhled�v�n�"
 
@@ -12507,16 +12716,25 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Zapamatujte si toto heslo"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr ""
 
@@ -12540,7 +12758,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr "Napi�te jm�no, kter� m� odkazovat na tento podpis."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Jm�no:"
 
@@ -12584,7 +12802,7 @@ msgstr ""
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12593,94 +12811,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Vslo�ky"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vslo�ky"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Editovat Vslo�ku"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - zpr�va"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Doln�"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Dnes %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "V�era %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %k:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr ""
 
@@ -12712,43 +12933,43 @@ msgstr "P�ijato"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "P�eposlat"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odpov�d�t"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Odpov�d�t v�em"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -12772,16 +12993,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Slo�ka"
 
-#: mail/subscribe-dialog.c:1516
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1577
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -17239,11 +17460,11 @@ msgid "Kushiro Airport"
 msgstr "Kushiro - leti�t�"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -22658,8 +22879,8 @@ msgstr ""
 msgid "Mail summary"
 msgstr "Po�ta"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:412
-#: my-evolution/e-summary-mail.c:740 shell/e-local-storage.c:1090
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "M�stn� slo�ky"
 
@@ -22677,15 +22898,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -22697,24 +22918,24 @@ msgstr ""
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "P�idat"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "��dn� �koly"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Nen� popis)"
 
@@ -23986,8 +24207,9 @@ msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Nastaven� slo�ky"
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -24041,7 +24263,7 @@ msgstr "Uk�zat detaily"
 msgid "Cancel Operation"
 msgstr "Zru�it operaci"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24058,8 +24280,8 @@ msgstr "P�idat slo�ku"
 msgid "Drafts"
 msgstr "Rozepsan�"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:401
-#: shell/e-shortcuts.c:1073
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "P��choz�"
 
@@ -24264,20 +24486,15 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - vytvo�it novou slo�ku"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Vytvo�it _novou slo�ku..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nov�..."
 
-#: shell/e-shell-folder-title-bar.c:636 shell/e-shell-folder-title-bar.c:637
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr ""
 
@@ -24319,103 +24536,99 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatick�"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Jm�no souboru:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importovat"
 
@@ -24458,8 +24671,13 @@ msgstr ""
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nelze p�ejmenovat slo�ku: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+msgid "Cannot find the specified shared folder."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
@@ -24473,8 +24691,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nov�"
@@ -24507,57 +24725,58 @@ msgstr ""
 msgid "About Ximian Evolution"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:492
+#: shell/e-shell-view-menu.c:473
 msgid "Go to folder..."
 msgstr "J�t na slo�ku..."
 
-#: shell/e-shell-view-menu.c:493
+#: shell/e-shell-view-menu.c:474
 msgid "Select the folder that you want to open"
 msgstr "Vyberte slo�ku, kterou chcete otev��t"
 
-#: shell/e-shell-view-menu.c:616 ui/evolution.xml.h:11
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Vytvo�it novou zkratku"
 
-#: shell/e-shell-view-menu.c:617
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte slo�ku, ke kter� m� zkratka v�st:"
 
-#: shell/e-shell-view-menu.c:786
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:799 ui/evolution.xml.h:64
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:812 ui/evolution.xml.h:40
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:229
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1847
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1849
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "Nic"
 
-#: shell/e-shell-view.c:1896
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1909
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -24570,12 +24789,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:769
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1861
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24583,19 +24802,19 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2162
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2164
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2166
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2168 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr ""
 
@@ -24707,95 +24926,105 @@ msgstr "P�ejmenovat skupinu zkratek"
 msgid "Rename selected shortcut group to:"
 msgstr "P�ejmenovat vybranou skupinu zkratek na:"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Mal� ikony"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Zobrazit zkratky jako mal� ikony"
 
-#: shell/e-shortcuts-view.c:231
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Velk� ikony"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Zobrazit zkratky jako velk� ikony"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nov� skupina..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Vytvo�it novou skupinu zkratek"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Odstranit tuto skupinu..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Odstranit tuto skupinu zkratek"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "P�e_jmenovat tuto skupinu..."
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "P�ejmenovat tuto skupinu zkratek"
 
-#: shell/e-shortcuts-view.c:255
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skr�t zkratkovou li�tu"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Skr�t zkratkovou li�tu"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Vytvo�it novou zkratku"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Vytvo�it novou zkratku"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "P�ejmenovat zkratku"
 
-#: shell/e-shortcuts-view.c:376
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "P�ejmenovat vybranou zkratku na:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Otev��t slo�ku s odkazem na tuto zkratku"
 
-#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:25
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otev��t v _nov�m okn�"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Otev��t slo�ku s odkazem na tuto zkratku v nov�m okn�"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_P�ejmenovat"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "P�ejmenovat tuto zkratku"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Odstranit"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstranit tuto zkratku ze zkratkov� li�ty"
 
-#: shell/e-shortcuts.c:649
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Chyba p�i ukl�d�n� zkratek."
 
-#: shell/e-shortcuts.c:1065
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Zkratky"
 
@@ -24803,55 +25032,55 @@ msgstr "Zkratky"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "��dn� chyba"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Slo�ka se stejn�m jm�nem ji� existuje"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Pro vytvo�en� slo�ky nen� dostatek m�sta"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Slo�ka nen� pr�zdn�"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Uveden� slo�ka nebyla nalezena"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operace nen� podporovan�"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uveden� slo�ka nem��e b�t upravov�na ani odstran�na"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Nelze vytvo�it slo�ku s t�mto jm�nem"
 
@@ -24902,63 +25131,63 @@ msgstr ""
 "Chyba z aktiva�n�ho syst�mu je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "P�eru�eno"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Ji� m� vlastn�ka"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "��dn� vlastn�k"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nenalezeno"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nepodporovan� typ"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nepodporovan� sch�ma"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nepodporovan� operace"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Vnit�n� chyba"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Nezb�v� ��dn� m�sto"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Star� vlastn�k zem�el"
 
@@ -24982,6 +25211,26 @@ msgstr "Host"
 msgid "The following connections are currently active:"
 msgstr "N�sleduj�c� spojen� jsou pr�v� aktivn�:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalend��"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakty: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Po�ta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "�_koly"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "N�zev slo�ky:"
@@ -24994,6 +25243,34 @@ msgstr "Typ slo�ky:"
 msgid "Specify where to create the folder:"
 msgstr "Up�esn�te, kde chcete vytvo�it slo�ku:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Otev��t slo�ku _jin�ho u�ivatele..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "N�zev slo�ky:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "N�zev _serveru:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Jm�no u�ivatele:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -25183,119 +25460,107 @@ msgstr "Kop�rovat v�b�r"
 msgid "Copy to Folder..."
 msgstr "Kop�rovat do slo�ky..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Vytvo�it nov� kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Vytvo�it nov� seznam kontakt�"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Vyjmout v�b�r"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Smazat vybran� kontakty"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "P�esunout kontakt(-y) do jin� slo�ky"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "P�esunout do slo�ky..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Vlo�it schr�nku"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-calendar.xml.h:16
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Tisknout _n�hled"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tisknout vybran� kontakty"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Ulo�it vybran� kontakty jako VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Vybrat v�e"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vybrat v�echny kontakty"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Poslat zpr�vu vybran�m kontakt�m."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Poslat zpr�vu kontaktu"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Poslat vybran� kontakty jin� osob�."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:43
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_P�eposlat kontakt..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Vybrat _V�e"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -25384,7 +25649,7 @@ msgid "Delete this item"
 msgstr "Smazat tuto polo�ku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:20
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -25396,8 +25661,8 @@ msgstr ""
 msgid "Print this item"
 msgstr "Tisknout tuto polo�ku"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Zapsat"
 
@@ -25422,9 +25687,9 @@ msgstr "Ulo�it tuto polo�ku na disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:47
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Soubor"
 
@@ -25434,7 +25699,7 @@ msgstr "Tisknout _ob�lku..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Ulo�it _jako..."
 
@@ -25448,8 +25713,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Ulo�it"
 
@@ -25547,26 +25812,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvale odstran� v�echny smazan� zpr�vy ze v�ech slo�ek"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Napsat _novou zpr�vu"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Kop�rovat vybran� zpr�vy do jin� slo�ky"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtu�ln� slo�ky..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -25663,7 +25938,7 @@ msgstr "Seznam zpr�v dle vl�ken"
 msgid "_Expunge"
 msgstr "_Vymazat"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:48
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Slo�ka"
 
@@ -25908,163 +26183,170 @@ msgid "P_revious Unread Message"
 msgstr "p�e_dchoz� nep�e�tenou zpr�vu"
 
 #: ui/evolution-mail-message.xml.h:62
+msgid "Post a Reply"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:63
+msgid "Post a reply to a message message in a Public folder"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "p�_edchoz� d�le�itou zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Prohl��en� zpr�vy p�ed tiskem"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "P�edchoz�"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Vytisknout tuto zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Obnovit text v jeho p�vodn� velikosti"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Vyhledat zpr�vu..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Men��"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Ulo�it tuto zpr�vu jako textov� soubor"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Vyhledat text v t�le zobrazen� zpr�vy"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Nastavit str�nku pro aktu�ln� tisk�rnu"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Uk�zat _zdroj e-malu"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Uk�zat celou _hlavi�ku"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Uk�zat zpr�vu v norm�ln�m stylu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Uk�zat zpr�vu se v�emi e-mailov�mi hlavi�kami"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Velikost textu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Obnovit smazan� vybran� zpr�vy"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kop�rovat do slo�ky"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Vytvo�it filtr ze zpr�vy"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_P�eposlat zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_J�t na"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Vlo�en�"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_V�t��"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Zobrazen� zpr�vy"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_P�esunout do slo�ky"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_n�sleduj�c� zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Otev��t zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_p�edchoz� zpr�vu"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citace"
 
-#: ui/evolution-mail-message.xml.h:109
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:62
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_N�stroje"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Obnovit smazan�"
 
@@ -26073,14 +26355,14 @@ msgid "Close this window"
 msgstr "Zav��t toto okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:44
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "U_zav��t"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:52 ui/evolution.xml.h:63
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Zobrazen�"
 
@@ -26108,158 +26390,156 @@ msgstr ""
 msgid "For_mat"
 msgstr "P�edform�tovan�"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otev��t"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otev��t soubor"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Ulo�it jako"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Ulo�it aktu�ln� soubor"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Ulo�it aktu�ln� soubor pod jin�m jm�nem"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Poslat"
 
-#: ui/evolution-message-composer.xml.h:28
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send this message"
 msgstr "Poslat tuto zpr�vu"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Uk�zat / skr�t p��lohy"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Uk�zat _p��lohy"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Uk�zat p��lohy"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_P��loha..."
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Smazat v�e"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Vlo�it"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Otev��t..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:51
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Ulo�it tuto polo�ku a zav��t dialog"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "N�_pov�da"
 
-#: ui/evolution-signature-editor.xml.h:15
+#: ui/evolution-signature-editor.xml.h:16
 msgid "_Signature editor"
 msgstr "Editor _podpisu"
 
@@ -26379,6 +26659,10 @@ msgstr "Vytvo�it odkaz na tuto slo�ku ve zkratkov� li�t�"
 msgid "Create a new folder"
 msgstr "Vytvo�it novou slo�ku"
 
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Vytvo�it novou zkratku"
+
 #: ui/evolution.xml.h:12
 msgid "Create a new window displaying this folder"
 msgstr "Vytvo�it nov� okno zobrazuj�c� tuto slo�ku"
@@ -26404,33 +26688,34 @@ msgid "Exit the program"
 msgstr "Ukon�it program"
 
 #: ui/evolution.xml.h:18
-msgid "Full_screen"
-msgstr "Cel�_obrazovka"
-
-#: ui/evolution.xml.h:19
 msgid "Import data from other programs"
 msgstr "Importovat data z jin�ch program�"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "P�esunout tuto slo�ku na jin� m�sto"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:21
 msgid "Open Other _User's Folder..."
 msgstr "Otev��t slo�ku _jin�ho u�ivatele..."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr "Otev��t slo�ku, kter� je zp��stupn�na jin�m u�ivatelem na serveru"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otev��t v nov�m oknu"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otev��t tuto slo�ku v jin�m okn�"
 
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "P�edb�n� nastaven�..."
+
 #: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Odeslat / p�ijmout"
@@ -26440,7 +26725,6 @@ msgid "Send queued items and retrieve new items"
 msgstr "Poslat polo�ky �ekaj�c� ve front� a p�ijmout nov� polo�ky"
 
 #: ui/evolution.xml.h:29
-#, fuzzy
 msgid "Set up Pilot configuration"
 msgstr ""
 
@@ -26465,41 +26749,42 @@ msgid "Toggle"
 msgstr "P�ep�na�"
 
 #: ui/evolution.xml.h:35
-msgid "Toggle fullscreen mode"
-msgstr "P�epnout celoobrazovkov� re�im"
-
-#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kop�rovat..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Li�ta _slo�ek"
 
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Slo�ka"
+
 #: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_J�t na slo�ku..."
@@ -26521,29 +26806,26 @@ msgid "_New Folder"
 msgstr "_Nov� adres��"
 
 #: ui/evolution.xml.h:56
-msgid "_Pilot Settings..."
-msgstr ""
-
-#: ui/evolution.xml.h:57
 msgid "_Preferences..."
 msgstr "_Volby..."
 
-#: ui/evolution.xml.h:58
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "P�e_jmenovat..."
 
-#: ui/evolution.xml.h:59
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Odeslat / p�ijmout"
 
-#: ui/evolution.xml.h:60
-msgid "_Shortcut"
-msgstr "Kl�vesov� zkratky"
-
-#: ui/evolution.xml.h:61
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Zkratkov� _li�ta"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "Kl�vesov� zkratky"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Tisknout shrnut�"
@@ -26770,11 +27052,11 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor vyhled�v�n�"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Ulo�it vyhled�v�n�"
 
@@ -26811,19 +27093,19 @@ msgstr "Zpr�va"
 msgid "Don't show this message again."
 msgstr "P���t� tuto zpr�vu nezobrazovat."
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "_Vyhledat"
 
-#: widgets/misc/e-search-bar.c:514
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr "Vy_mazat"
 
-#: widgets/misc/e-search-bar.c:876
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Vymazat"
 
-#: widgets/misc/e-search-bar.c:878
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Vyhledat"
 
@@ -26837,18 +27119,54 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Stav sch�zky se zm�nil. Poslat aktualizovanou verzi?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Zru�it tuto ud�lost"
+
+#~ msgid "Insert File"
+#~ msgstr "Vlo�it soubor"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Datum zpr�vy bude porovn�v�no s �asem,\n"
+#~ "kdy bude spu�t�n filtr nebo\n"
+#~ "bude otev�ena Vslo�ka."
+
+#~ msgid "View messages..."
+#~ msgstr "Prohl��et zpr�vy ..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - vytvo�it novou slo�ku"
+
+#~ msgid "Create new contact"
+#~ msgstr "Vytvo�it nov� kontakt"
+
+#~ msgid "Create new contact list"
+#~ msgstr "Vytvo�it nov� seznam kontakt�"
+
+#~ msgid "Full_screen"
+#~ msgstr "Cel�_obrazovka"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "P�epnout celoobrazovkov� re�im"
+
 #~ msgid "&lt;- _Remove"
 #~ msgstr "&lt;- _Odstranit"
 
@@ -26888,9 +27206,6 @@ msgstr ""
 #~ msgid "Description"
 #~ msgstr "Popis"
 
-#~ msgid "_Create Signature"
-#~ msgstr "_Vytvo�it podpis"
-
 #~ msgid "Addressbook Settings"
 #~ msgstr "Nastaven� adres��e"
 
diff --git a/po/da.po b/po/da.po
index b65c7e3097..6264eeac27 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-03-08 23:41+0100\n"
 "Last-Translator: Anna Jonna Armannsdottir <a@ingenioer.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -36,7 +36,7 @@ msgstr "Importerer VCard-filer i Evolution."
 msgid "File As"
 msgstr "Gem som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
@@ -344,46 +344,46 @@ msgstr "VCard for %s"
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "S�ger..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Indl�ser..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Fejl i s�geudtryk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Tilf�jer kort p� LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "�ndrer kort fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Starter s�gning igen."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Modtager s�geresultater fra LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Kunne ikke tolke URL `%s'"
@@ -475,11 +475,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -495,23 +495,32 @@ msgstr "LDAP-server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som indeholder kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Opret en ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Opret en ny kontaktliste"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -534,30 +543,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL er ikke underst�ttet i denne version af evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunne ikke initiere gnome-vfs"
 
@@ -565,11 +574,11 @@ msgstr "Kunne ikke initiere gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �bne adressebogen"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -579,7 +588,7 @@ msgstr ""
 "at du har indtastet en ugyldig URI, eller at LDAP-serveren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -591,7 +600,7 @@ msgstr ""
 "m� du overs�tte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra henvisningen nedenfor.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -599,44 +608,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Indtast adgangskode for %s (bruger %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "slutter med"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avanceret..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappe-skimmeren vil vise"
 
@@ -758,7 +767,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adressebog-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -852,8 +861,8 @@ msgstr "Konfiguration"
 msgid "Mappings"
 msgstr "Margener"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_hver"
@@ -905,8 +914,8 @@ msgstr "S�_geomr�de:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "S�ger..."
 
@@ -1097,15 +1106,15 @@ msgid "Using email address"
 msgstr "De_tte er postadressen"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Tilf�j"
 
@@ -1151,12 +1160,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_edig�r"
@@ -1271,10 +1280,10 @@ msgstr "Fabrik til adressebogens gr�nseflade for navnevalg"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1303,43 +1312,15 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "V�lg kontakter fra adressebogen"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Afsender indeholder"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution kan ikke finde det lokale lager for adressebog. \n"
-"Dette kan v�re for�rsaget af, at Evolution-adressebogs-komponenten er g�et "
-"ned. \n"
-"For at hj�lpe os med at forst� og til slut l�se problemet, \n"
-"m� du gerne sende en besked til Jon Trowbridge <trow@ximian.com> med en \n"
-"detaljeret beskrivelse af omst�ndighederne omkring fejlen. Tak."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution kan ikke finde det lokale lager for adressebog. \n"
-"Under normale omst�ndigheder ville dette aldrig ske. \n"
-"Du beh�ver m�ske at forlade og genstarter Evolution for at \n"
-"l�se dette problem."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "V�lg kontakter fra adressebogen"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "V�lg navn"
@@ -1361,15 +1342,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Flyt..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Mappe:"
 
@@ -1475,11 +1451,12 @@ msgstr "�nsker at modtage e-post som _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -2718,7 +2695,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser n�r du sender e-post til listen"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -2781,7 +2758,7 @@ msgstr ""
 "eksisterer allerede i denne mappe. Vil du tilf�je den alligevel?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Avanceret s�gning"
 
@@ -2809,21 +2786,21 @@ msgid "Error getting book view"
 msgstr "Fejl under start af %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fejl ved �ndring af kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -2831,8 +2808,8 @@ msgstr "Ukendt fejl"
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Tilgang n�gtet"
 
@@ -2849,7 +2826,7 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikke underst�ttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2872,48 +2849,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Filen %s eksisterer ikke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du gemme �ndringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Fejl ved tilf�jelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Fejl ved tilf�jelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Fejl ved �ndring af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2921,22 +2903,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Sucro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ingen kort"
@@ -3009,7 +2991,7 @@ msgstr "Adressebog"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gem som VCard"
 
@@ -3049,7 +3031,7 @@ msgid "Pilot Settings..."
 msgstr "Indstillinger for _h�hdholdt..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
@@ -3058,8 +3040,8 @@ msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Udskriv"
@@ -3079,7 +3061,7 @@ msgid "Move to folder..."
 msgstr "Fl_yt til mappe..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
@@ -3090,20 +3072,20 @@ msgid "Copy"
 msgstr "Kopier"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Inds�t"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slet"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3272,7 +3254,7 @@ msgstr "Margener"
 msgid "Number of columns:"
 msgstr "Antal kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Alternativer"
 
@@ -3362,26 +3344,26 @@ msgstr "Unavngivet aftale"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "H�j"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Udefineret"
@@ -3505,11 +3487,11 @@ msgstr "Uds�t-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_edig�r aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Ingen beskrivelse tilg�ngelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3521,13 +3503,13 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for p�mindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3544,7 +3526,7 @@ msgstr ""
 "\n"
 "Er du sikker p�, at du �nsker at k�re dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Sp�rg mig ikke igen."
@@ -3573,7 +3555,7 @@ msgstr "Beskrivelse indeholder"
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Ingen tr�ffere"
 
@@ -3584,7 +3566,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
@@ -3606,19 +3588,19 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke oprette kalendervisning. Kontroll�r venligs din konfiguration af "
 "ORBit og OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Fortroligt"
@@ -3643,37 +3625,37 @@ msgstr "�"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Optaget"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "I gang"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Fuldf�rt"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3684,56 +3666,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Genindtr�ffer"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nej"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Arbejdsugevisning"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Ugevisning"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "M�nedsvisning"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3741,12 +3722,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mappe som indeholder aftaler og h�ndelser"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Opgaver"
 
@@ -3754,44 +3735,62 @@ msgstr "Opgaver"
 msgid "Folder containing to-do items"
 msgstr "Mappe som indeholder opgaver"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny aftale"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Aftale"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Indstillinger for nyhedstjeneste"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�de"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Opret en ny opgave"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Ny opgave"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Opret en ny opgave"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny aftale"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Ny aftale"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Aftale"
+msgid "Create a new all-day appointment"
+msgstr "Opret en ny aftale"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3858,7 +3857,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dage"
 
@@ -3866,11 +3866,13 @@ msgstr "dage"
 msgid "extra times every"
 msgstr "ekstra gange hver"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutter"
 
@@ -3998,7 +4000,7 @@ msgstr "P�mindelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4027,7 +4029,7 @@ msgstr "slutning p� aftale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4205,7 +4207,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4250,19 +4252,33 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "f�r aftalen starter"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "M�destatus er �ndret. Send en opdateret version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker p�, at du vil aflyse og slette dette m�de?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker p�, at du vil aflyse og slette denne opgave?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker p�, at du vil aflyse og slette denne journalopf�ring?"
 
@@ -4334,61 +4350,61 @@ msgstr " (F�rdig "
 msgid "Due "
 msgstr "F�rdig "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objektet."
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redig�r aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versionsdata!"
 
@@ -4587,7 +4603,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
@@ -4599,7 +4615,7 @@ msgstr "Rolle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4684,7 +4700,7 @@ msgstr "p�"
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
@@ -4708,7 +4724,7 @@ msgstr "liste"
 msgid "Other Date"
 msgstr "Anden fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
@@ -4808,20 +4824,26 @@ msgstr "% f�rdig"
 msgid "Date Completed:"
 msgstr "Dato for fuldf�relse:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Beh�ver handling"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Fremgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -4835,7 +4857,7 @@ msgstr "Grundl�ggende"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4904,80 +4926,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�bn"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopi�r"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Inds�t"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Videresend som i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Mark�r som fuldf�rt"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark�r opgaver som fuldf�rte"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik for at tilf�je en opgave"
@@ -4986,8 +5008,8 @@ msgstr "Klik for at tilf�je en opgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Fuldf�rt"
 
@@ -5015,11 +5037,9 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Startdato"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -5061,111 +5081,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Ny _aftale"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "M�de"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Udskriv..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguration"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfiguration"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ops�t _m�de"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Videresend som i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "G�r denne h�ndelse _flytbar"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _h�ndelse"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle h�ndelser"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilotv�rkt�jerne ser ikke ud til at v�re installeret p� dette system."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl under k�rsel af %s."
@@ -5206,7 +5225,7 @@ msgstr "Opgave fuldf�rt <b>"
 msgid "Task Due: <b>"
 msgstr "Opgave p�begyndes: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
@@ -5215,12 +5234,12 @@ msgstr "iCalendar-information"
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5228,324 +5247,329 @@ msgstr ""
 "<br>Kontroll�r venligst f�lgende information og v�lg s� en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Geografisk lokation:"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "V�lg en handling"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Foresl�et"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Afsl�et"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort m�deoplysning."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "M�deinformation"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedev�relse i et m�de."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "M�deforslag"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �nsker at tilf�je information til et eksisterende m�de."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "M�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �nsker at modtage seneste m�deinformation."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Anmodning om m�deopdatering"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret p� en m�deforesp�rgsel."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "M�desvar"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et m�de."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "M�deaflysing"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforst�elig besked."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�debesked"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udf�rer en opgave."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �nsker at tilf�je information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �nsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret p� en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Svar p� opgave"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Foresp�rgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret p� en foresp�rgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Svar p� ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder foresp�rgsler, som ikke er underst�ttet."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Opdatering fuldf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke l�ngere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Fjernelse fuldf�rt"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "V�lg mappe"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "V�lg mappe"
@@ -5591,7 +5615,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Form�nd"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
@@ -5604,57 +5628,52 @@ msgid "Non-Participants"
 msgstr "Ikke-deltagere"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuel"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressourse"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Rum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Formand"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Beh�ver handling"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Foresl�et"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegeret"
 
@@ -5744,49 +5763,46 @@ msgstr "Tid for m�dets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for m�dets slutning:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�bner lager %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke indl�se opgaverne i `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Den n�dvendige metode til indl�sning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Kunne ikke �bne mappen i `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fuldf�rt dato"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "Sle_t denne aftale"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5797,11 +5813,16 @@ msgstr "Kunne ikke �bne mappen i `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Den n�dvendige metode til �bning af `%s' er ikke underst�ttet"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�bner kalender ved %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�bner mappe %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5858,53 +5879,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Mindst en deltager er n�dvendig"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "En organisator skal angives."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Ledig/optaget-information"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "L�s listen igen"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i arrangementet"
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Kunne ikke initialisere Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Kunne ikke oprette fabrik for komponentredigering"
 
@@ -6131,9 +6157,8 @@ msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Forh�ndsvisning af udskrift"
 
@@ -6169,8 +6194,8 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Sp�rg mig ikke igen."
 
@@ -6236,17 +6261,29 @@ msgstr "Importerer VCard-filer i Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerer VCard-filer i Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Kunne ikke koble til lager: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "P�mindelse"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenderbesked"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6255,85 +6292,85 @@ msgstr ""
 "Evolution har fundet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "tid-nu forventer 0 argumenter"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time forventer 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 til make-time skal v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day forventer 2 argumenter"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day forventer at argument 2 er et heltal"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? forventer at argument 1 er af type time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range forventer at argument 2 er af type time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6341,11 +6378,11 @@ msgstr ""
 "contains? forventer at argument 1 er en af \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer mindst 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6353,19 +6390,19 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller �t, og kun "
 "�t, argument er den boolske v�rdi falsk (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 1 argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering af s�geudtrykket gav ikke en boolsk v�rdi"
 
@@ -7965,72 +8002,82 @@ msgstr "Gemmer mappe '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Du skal arbejde opkoblet for at fuldf�re denne operation"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under l�sning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under k�rsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke �bne spool-mappen"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Kan ikke �bne besked"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes p� besked %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes p� besked %d af %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Ugyldige argumenter"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Ugyldige argumenter"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udf�relse af filters�gning: %s: %s"
@@ -8086,7 +8133,7 @@ msgstr "Flytter beskeder"
 msgid "Copying messages"
 msgstr "Kopierer beskeder til %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8094,47 +8141,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra POP-server: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Intet filnavn specificeret."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere denne besked: ingen modtagere opgivet"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8142,18 +8189,18 @@ msgid ""
 "%.*s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Fejl under mellemlagring af besked %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Kunne ikke afkode besked."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8180,22 +8227,22 @@ msgid "Could not lock '%s'"
 msgstr "Kunne ikke l�se '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke oprette l�sefil for %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsafbrud under ventning p� l�sefil for %s. Pr�v igen senere."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Fejl under l�sning ved brug af fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fejl under l�sning ved brug af flock(2): %s"
@@ -8254,11 +8301,15 @@ msgstr "Fejl under skriving af midlertidig fil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fejl under kopiering midlertidig beskedsfil: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8395,7 +8446,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar p� autenticering fra server."
 
@@ -8570,31 +8621,134 @@ msgstr "Kan ikke finde mappe: Ugyldig operation p� dette lager"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation p� dette lager"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Fejl under verificering af certifikater."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Fejl under verificering af certifikater."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Signaturfil:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Fejl under indl�sning af %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Ude"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
 msgstr ""
-"Ugyldig certifikat fra %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Vil du acceptere alligevel?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Fejl under verificering af certifikater."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ugyldige argumenter"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8603,16 +8757,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Ugyldig certifikat fra %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Vil du acceptere alligevel?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8632,32 +8803,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Fejl under start af %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen s�dan besked %s i %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ugyldig operation"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
@@ -8665,12 +8841,12 @@ msgstr "Kan ikke �ndre navn p� mappe: %s: Ingen s�dan mappe"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -8699,40 +8875,40 @@ msgstr "Svar fra IMAP-server indeholdt ikke %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet 'OK'-svar fra IMAP-server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indl�se sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev �delagt og genskabt p� serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "S�ger efter �ndrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilg�ngelig"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -8741,10 +8917,10 @@ msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 msgid "Could not open cache directory: %s"
 msgstr "Kan ikke �bne cache-katalog: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Fejl under mellemlagring af besked %s: %s"
@@ -8757,7 +8933,7 @@ msgstr "Ser efter nye beskeder"
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mapper"
 
@@ -8787,7 +8963,7 @@ msgstr "For l�sning og lagring af e-post p� IMAP-servere."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -8797,73 +8973,77 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s-tjeneste for %s p� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operationen er ikke underst�ttet"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Godkendelse mislykkedes."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mappen er ikke tom"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen underst�tte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8874,31 +9054,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mappenavn kan ikke indeholde linjeskift."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Kan ikke �bne postboks: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8920,7 +9106,10 @@ msgid "Local delivery"
 msgstr "Lokale levering"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "For hentning af lokal e-post fra standard \"spools\" i mbox format"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8948,13 +9137,13 @@ msgstr "Standard Unix mbox \"spools\""
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "For l�sning og lagring af lokal e-post i standard mbox \"spool\"-filer."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8965,38 +9154,38 @@ msgstr "Lagerrod %s er ikke en absolut sti"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
@@ -9056,7 +9245,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9094,26 +9283,26 @@ msgstr "ikke et maildir katalog"
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ge i mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke �bne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Ser efter nye beskeder"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "S�ger efter nye beskeder"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Gemmer mappe"
@@ -9157,7 +9346,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9166,7 +9355,7 @@ msgstr ""
 "Kunne ikke �bne fil `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9175,14 +9364,14 @@ msgstr ""
 "Kunne ikke oprette fil '%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en normal fil."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9191,7 +9380,7 @@ msgstr ""
 "Kunne ikke slette mappen `%s'\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
@@ -9206,64 +9395,64 @@ msgstr "Kunne ikke �bne mappe %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke tjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke �bne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke �bne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke �ndre navn p� mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Skriving til midlertidig postboks mislykkedes: %s: %s"
@@ -9416,50 +9605,50 @@ msgstr "Afbryd"
 msgid "Operation failed: %s"
 msgstr "Operation afbrudt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operation afbrudt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede beskeder"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen besked med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ukendt nedb�r"
@@ -9477,7 +9666,7 @@ msgstr "Behold beskeder p� serveren"
 msgid "Delete after %s day(s)"
 msgstr "Slet efter %s dage"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9504,6 +9693,11 @@ msgstr ""
 "adgangskode via APOP-protokollen. Dette vil m�ske ikke virke for alle "
 "brugere selv p� servere som h�vder at underst�tte det."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Kunne ikke koble til %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9515,54 +9709,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke koble til POP-server p� %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Kunne ikke koble til POP-serveren.\n"
 "Ingen underst�ttelse for forespurgt autenticeringsmekanisme."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/U-fejl"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Kunne ikke autenticere mod KPOP-server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIndtast venligst POP3-adgangskode for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl ved oversending af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen s�dan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9589,35 +9785,35 @@ msgstr "Kunne ikke oprette kanal til sendmail: %s: besked ikke sendt"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke k�re fork p� sendmail: %s: besked ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende beskeden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail afsluttet med signal %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke k�re %s: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail afsluttet med status %d: besked ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9725,45 +9921,45 @@ msgstr "Midlertidig autenticeringsfejl"
 msgid "Authentication required"
 msgstr "Autenticering kr�ves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Fejl ved Velkomst-svar: %s: muligvis ikke-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Kunne ikke koble til POP-server.\n"
 "Fejl under oversending af brugernavn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Beskeden ser ikke ud til at v�re rigtig udformet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s underst�tter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9774,90 +9970,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Tidsafbrud for HELO-foresp�rgsel: %s: ikke-fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Fejl ved HELO-svar: %s: ikke-fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Fejl ved RSET-svar: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH-foresp�rgsel mislykkedes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar p� autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fejl ved \"MAIL FROM\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-foresp�rgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
@@ -9865,90 +10061,90 @@ msgstr "Tidsafbrud for DATA-foresp�rgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-send: beskedsterminering: %s: besked ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Ugyldigt svar p� autenticering fra server."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsafbrud for RSET-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Tidsafbrud for QUIT-foresp�rgsel: %s: ikke-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Tidsafbrud for AUTH-foresp�rgsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fejl ved RSET-svar: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opf�ringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Tilf�j bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Vedl�g en fil til beskeden"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke vedl�gge fil %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke vedl�gge fil %s: ikke en almindelig fil"
@@ -9966,56 +10162,60 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning af bilag"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Klik her for at f� adressebogen op"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Fra:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Fra:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Indtast modtagerene for beskeden"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Indtast adresserne som skal modtage en kopi af beskeden"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10023,17 +10223,25 @@ msgstr ""
 "Indtast adresserne som skal modtage en kopi af beskeden uden at komme til "
 "syne i modtagerlisten for beskeden."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Vedl�g en fil"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke oprette PGP signaturkontekst."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10042,34 +10250,34 @@ msgstr ""
 "Fejl under l�sning af fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl under gemning af fil: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl under indl�sning af fil: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fejl ved adgang til fil: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10078,7 +10286,7 @@ msgstr ""
 "Kunne ikke s�ge i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10087,7 +10295,7 @@ msgstr ""
 "Kunne ikke afkorte fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10096,7 +10304,7 @@ msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10104,7 +10312,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10114,43 +10322,39 @@ msgstr ""
 "\n"
 "Vil du gemme �ndringene?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Advarsel: �ndret besked"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "�bn fil"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Inds�t fil"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Gem signatur"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (forvalgt)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Skriv en besked"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10158,7 +10362,7 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "adressse-udv�lgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10166,9 +10370,9 @@ msgstr ""
 "Kunne ikke oprette vindue:\n"
 "En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10232,8 +10436,8 @@ msgstr "Emne indeholder"
 msgid "Subject does not contain"
 msgstr "Emne indeholder ikke"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10241,12 +10445,11 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Husk denne adgangskode"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk denne adgangskode for resten af denne session"
 
@@ -10345,150 +10548,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%H"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "�r"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "�r"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " sekunder"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�ned"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "m�neder"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "time"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "uge"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "uger"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "time"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�ned"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "m�neder"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr " sekunder"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "�r"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "�r"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Du har glemt at v�lge en dato."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Du har valgt en ugyldig dato."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med tiden\n"
-"n�r filteret k�res eller tiden n�r vfolderen\n"
-"�bnes."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med\n"
-"tiden du specificerer her."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Beskedens dato vil blive sammenlignet med\n"
-"en tid relativ til n�r filteret bliver k�rt;\n"
-"for eksempel \"for en uge siden\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "tiden nu"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "en tid du specificerer"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "en tid relativ til tiden nu"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "V�lg en tid at sammenligne med"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Sammenlign med"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klik her for at v�lge en dato>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " siden"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "siden"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %d. %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %H:%M"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " siden"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<klik her for at v�lge en dato>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "V�lg en tid at sammenligne med"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stilnavn:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' eksisterer ikke eller er ikke en normal fil"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "V�lg en handling"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "S�"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Tilf�j handling"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10496,12 +10649,12 @@ msgstr ""
 "Du glemte at v�lge en mappe.\n"
 "Venligst g� tilbage og specificer en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "V�lg mappe"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10510,92 +10663,168 @@ msgstr ""
 "Fejl i regul�rt udtryk '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Vigtig"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "efter"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Du skal give navn til dette filter."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Uden navn"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Udf�r handlinger"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er m�dt"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er m�dt"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Tilf�j kriterie"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "indkommende"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "udg�ende"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Sammenlign med"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Rediger filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Rediger Virtuelle-mapper"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Indkommende"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Udg�ende"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Beskedens dato vil blive sammenlignet med\n"
+"tiden du specificerer her."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Beskedens dato vil blive sammenlignet med\n"
+"en tid relativ til n�r filteret bliver k�rt;\n"
+"for eksempel \"for en uge siden\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Beskedens dato vil blive sammenlignet med\n"
+"tiden du specificerer her."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "en tid relativ til tiden nu"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "siden"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "kun specifikke mapper"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "tiden nu"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "en tid du specificerer"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
@@ -10623,42 +10852,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Firma"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "indeholder"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato modtaget"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Slettet"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "slutter ikke med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "eksisterer ikke"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "eksisterer ikke"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ligner ikke"
@@ -10680,93 +10909,89 @@ msgid "ends with"
 msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksisterer"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Udtryk"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Vigtig"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "var efter"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "var f�r"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "M�rket"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "er st�rre end"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre end"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "er ikke"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "M�rket"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Beskedskrop"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Beskedshoved"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flyt til mappe"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Send besked til kontakt"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Afspil lyd:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "L�s"
 
@@ -10782,57 +11007,87 @@ msgstr "Tr�ffer p� regul�rt udtryk"
 msgid "Replied to"
 msgstr "Svaret til"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "er st�rre end"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "er mindre end"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Point"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Afsender"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "S�t status"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "St�rrelse (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "lyder som"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifik header"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "starter med"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "S�t status"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Tilf�j regel"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -10840,11 +11095,11 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Pointregler"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Du skal give navn til denne vfolder."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du skal specificere mindst en mappe som kilde."
 
@@ -10852,31 +11107,31 @@ msgstr "Du skal specificere mindst en mappe som kilde."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerer..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Venligst vent"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "S�ger i %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Post"
 
@@ -10937,39 +11192,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Affald"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokal e-post-fil %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "S�ger i katalog"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediger filtre"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11050,12 +11305,12 @@ msgstr "Fabrik for e-post sammendrag komponent."
 msgid "Font Preferences"
 msgstr "I_ngen genindtr�ffelse"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontoer"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11103,7 +11358,7 @@ msgstr "Egenskaber ..."
 msgid "Change this folder's properties"
 msgstr "�ndr denne mappes egenskaber"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11111,58 +11366,78 @@ msgstr ""
 "Nogen af dine indstillinger for e-post ser ud til at v�re beskadiget. "
 "Venligst tjek at alt er i orden."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke sat en transportmetode for e-post"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Advarsel: �ndret besked"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Ny e-post besked"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Skriv en besked"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Ny besked"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Forrige besked"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Ny e-post besked"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurationskomponent for e-post."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kobler til server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring med skallen"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaber for \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Egenskaber"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
@@ -11212,135 +11487,135 @@ msgstr "%d totalt"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra besked"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe p� e-post_liste"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� em_ne"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� afsen_der"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtr�r p� modta_gere"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtr�r p� e-_postliste"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "R_edig�r som ny besked..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Fuldf�rt"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_k�r som l�st"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Mark�r som _ul�st"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Mark�r som v_igtig"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Mark�r som uv_igtig"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Fortryd sletning"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Tilf�j sender i adressebog"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "P�f�r filtre"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Opret rege_l fra besked"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuel mappe p� e-postliste"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r efter e-postliste (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuel mappe p� e-postliste (%s)"
@@ -11405,76 +11680,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution nyhedsredigerer"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_V�rt:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ugernavn:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke oprette to konti med samme navn."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil slette denne konto?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Slet ikke"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Vil du virkelig slette kontoen?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Er du sikker p� at du vil slette denne nyhedsgruppekonto?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Konton_avn:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11484,30 +11750,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Tilf�j filterregel"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11519,7 +11785,7 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11531,7 +11797,7 @@ msgstr ""
 "modtage eller skrive beskeder.\n"
 "Vil du konfigurere den nu?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11539,7 +11805,7 @@ msgstr ""
 "Du skal konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11548,7 +11814,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11556,11 +11822,11 @@ msgstr ""
 "Du sender en besked i HTML-format, men f�lgende modtageres �nsker ikke at "
 "modtage beskeder i HTML-format:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Send alligevel?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11568,7 +11834,7 @@ msgstr ""
 "Denne besked har ikke et emne.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11576,11 +11842,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigureret til at skjule listens "
 "adresser vil denne besked kun indeholde Bcc-modtagere."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Denne besked indeholder kun Bcc-modtagere."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11590,15 +11856,11 @@ msgstr ""
 "\"Apparently-To\" header.\n"
 "Send alligevel?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Du skal konfigurere en konto f�r du kan sende denne besked."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11606,28 +11868,28 @@ msgstr ""
 "Kunne ikke �bne skitse-mappen for denne konto.\n"
 "Vil du bruge standard skitse-mappe?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flyt beskeder til"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopi�r beskeder til"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d beskeder?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11635,7 +11897,7 @@ msgstr ""
 "Du kan kun redigere beskeder gemt\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11643,39 +11905,39 @@ msgstr ""
 "Du kan kun sende beskeder igen\n"
 "som er gemt i sendt-kataloget."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ingen besked valgt"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis n�ste ul�ste besked"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11687,7 +11949,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse beskeder?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11696,28 +11958,28 @@ msgstr ""
 "Fejl under indl�sning af filter-information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Fejl under udskrift af besked"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �bne alle %d beskeder i separate vinduer?"
@@ -11738,7 +12000,7 @@ msgstr "Inegn beskrivelse"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt uden navn:"
@@ -11759,20 +12021,21 @@ msgid "Add Signature"
 msgstr "Gem signatur"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Indtast venligst navn og e-post adresse nedenunder. De \"valgfrie\" felter "
 "nedenunder skal ikke n�dvendigvis fyldes ud,\n"
 "hvis du ikke �nsker at inkludere denne information i beskederne du sender."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Indtast venligst information om din server for indkommende e-post "
 "nedenunder.\n"
@@ -11784,24 +12047,23 @@ msgid "Please select among the following options"
 msgstr "Venligst v�lg mellem f�lgende alternativer"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Indtast venligst information om m�den du sender e-post. Hvis du ikke er "
 "sikker, kontakt din systemadministrator\n"
 "eller din Internet-tjenesteudbyder."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Du er n�sten f�rdig med konfigurationsprocessen. V�rdierne for identitet, "
 "indkommende e-post-server og\n"
@@ -11811,44 +12073,20 @@ msgstr ""
 "nedenunder. Dette navn bliver kun brugt for visning p� sk�rmen."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "efter"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Tjekker tjeneste"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
@@ -12113,241 +12351,229 @@ msgstr "Gem og luk"
 msgid "Loading Images"
 msgstr "Indl�s b_illeder"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Beskedshoved"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Beskedsvisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesien"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP-server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Nyhedstjenester"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Yderligere information"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisat_ion:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-n�gle _ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "V�lg en farve"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sp�rg ved sending af beskeder med kun _Bcc-modtagere defineret"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Udskriv valgte kontakter"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikke �bne besked"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "H_usk denne adgangskode"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Svar-til:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Indkommende e-post"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Alternativer indkommende"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Husk denne adgangskode"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "N�dvendig information"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Forvalgt"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sikkerhed"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "V�lg PGP-bin�rfil"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _beskeder:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sendte beskeder og skisser"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server kr�ver _autenticering"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genveje"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Gem signatur"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Gem signatur"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Kilde"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Kildeinformation"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnavn:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12357,204 +12583,200 @@ msgstr ""
 "\n"
 "Klik \"N�ste\" for at begynde. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "�st"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Altid indl�s billeder fra nettet"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autenticeringstype: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Hent beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekr�ft n�r slettede beskeder skal fjernes"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvalgt"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktiver"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Videresend som"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fulde navn:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML e-post"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Indl�s billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Brug denne som stan_dard konto"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Mark�r beskeder som l�st efter"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Indl�s aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sp�rg ved sending af HTML-beskeder til kontakter som ikke �nsker dem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sp�rg ved sending af beskeder uden _emne"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Indkommende e-post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Udg�ende e-post"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vis tid som"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Brug sikker forbindelse (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_hver"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " farve"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "nyhedsvindue1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12578,203 +12800,213 @@ msgstr "Kunne ikke oprette S/MIME \"envelope\" kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke oprette S/MIME afkodningskontekst."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Gem bilag"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Gem til disk..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Gem bilag"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Vis indlejret"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "�bn i %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis indlejret (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Indl�s b_illeder"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Indl�ser beskedsindhold"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Overskredne opga_ver:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %H:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "�bn henvisning i netl�ser"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopi�r henvisning"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Gem henvisning som"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Gem billede som..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilag"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke l�se MIME-besked. Viser ren beskedstekst."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "E-postprogram: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Gem besked som..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne besked er digitalt signeret. For flere informationer, klik p� "
 "l�sikonen."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke oprette PGP verificeringskontekst."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne besked er digitalt signeret og er fundet autentisk."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-server (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig p� netsted \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peger til eksterne data (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne �bne denne mappe igen: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke gemme metainformation om mappe p�: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformation for mappe %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ndrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan m�ske ikke konfigureres igen fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12782,16 +13014,16 @@ msgstr ""
 "Hvis du ikke kan �bne denne postboks igen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke �ndre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigur�r /%s igen"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12800,7 +13032,7 @@ msgstr ""
 "Fejl under '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12809,7 +13041,7 @@ msgstr ""
 "Fejl under udf�rsel af operation:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Arbejder"
 
@@ -12817,100 +13049,100 @@ msgstr "Arbejder"
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Fuldf�rte alligevel sending af beskeden."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fejlet p� besked %d af %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Fuldf�rt."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�bner mappe %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "�bner lager %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d beskeder"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12919,7 +13151,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12928,11 +13160,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12941,27 +13173,22 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_S�g"
 
@@ -13016,32 +13243,41 @@ msgstr "Sti: %s, Type: %s"
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Send & modtag e-post"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Afbryd alle"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Opdaterer..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Husk denne adgangs_kode"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Husk denne adgangskode for resten af denne session"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
@@ -13068,7 +13304,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Navn:"
 
@@ -13098,7 +13334,7 @@ msgstr "Videresendt besked - %s"
 msgid "Forwarded message"
 msgstr "Videresendt besked"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Videresendt besked"
 
@@ -13112,7 +13348,7 @@ msgstr "Ops�tter vmappe: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13125,94 +13361,97 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Uden emne)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Besked"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ul�st"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "L�st"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Flere ul�ste beskeder"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "H�jere"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "H�jest"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %H:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -13247,47 +13486,47 @@ msgstr "Modtaget"
 msgid "Size"
 msgstr "St�rrelse"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McAll"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "G� fremad"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Kildeinformation"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Forh�ndsvis"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13311,16 +13550,16 @@ msgstr "Abonnerer p� mappe \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Venligst v�lg en server."
 
@@ -17785,11 +18024,11 @@ msgid "Kushiro Airport"
 msgstr "Kushiro lufthavn"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23211,8 +23450,8 @@ msgstr "Inegn beskrivelse"
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -23230,15 +23469,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Dagens citater"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Tilf�j nyheds-server"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Indtast URL for nyhedsstedet du vil tilf�je"
 
@@ -23250,27 +23489,27 @@ msgstr "Fejl under nedhentning af RDF"
 msgid "News Feed"
 msgstr "Nyhedstjenester"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Tilf�j"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Regnbyger"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Ingen opgaver"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
@@ -24543,7 +24782,8 @@ msgid "Tasks "
 msgstr "Opgaver "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Indstillinger for vejr"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24600,7 +24840,7 @@ msgstr "Vis detaljer"
 msgid "Cancel Operation"
 msgstr "Aflys operation"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24614,20 +24854,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "V�lg mappe"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Skitser"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Udboks"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Sendt"
 
@@ -24868,22 +25108,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Opret ny mappe"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typen for valgt mappe er ikke gyldig for den\n"
-"forespurgte operation."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Opret _ny mappe..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Uden navn)"
 
@@ -24905,7 +25138,7 @@ msgstr ""
 "Du kan v�lge \"Automatisk\" hvis du ikke v�d, s� vil Evolution pr�ve at "
 "finde ud af hvilken type det er for dig."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Venligst v�lg information du �nsker at importere:"
 
@@ -24936,21 +25169,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Du kan kun importere til lokale mapper"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24959,11 +25188,11 @@ msgstr ""
 "Ingen importerer som kan h�ndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24972,17 +25201,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Fejl under start af %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Fejl under indl�sning af %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24991,31 +25220,31 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opf�ring 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "V�lg en fil"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25023,24 +25252,24 @@ msgstr ""
 "Venligst vent...\n"
 "S�ger efter eksisterende ops�tning"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "V�lg mappe"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "V�lg en m�lmappe til at importere data"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
@@ -25088,9 +25317,14 @@ msgstr "�bner mappe %s"
 msgid "in \"%s\" ..."
 msgstr "�bn i %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kunne ikke �ndre navn p� mappe: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kan ikke oprette specificeret katalog:\n"
 "%s"
@@ -25108,8 +25342,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte postassistent-gr�nsefladen for Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -25150,56 +25384,57 @@ msgstr "G� til mappe..."
 msgid "Select the folder that you want to open"
 msgstr "V�lg mappen du �nsker at �bne"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Opret en ny genvej"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "V�lg mappen du �nsker genvejen skal pege til:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klik p� denne knap for at arbejde frakoblet."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i f�rd med at koble fra."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klik p� denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25211,12 +25446,12 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke ops�tte lokal lagring -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25227,31 +25462,31 @@ msgstr ""
 "er afsluttet uventet. Du m� afslutte Evolution og genstarte\n"
 "for at f� adgang til disse data igen."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Generisk fejl"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Opret ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25260,107 +25495,117 @@ msgstr ""
 "Vil du virkelig fjerne gruppen\n"
 "`%s' fra genvejslinjen?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Fjern ikke"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Omd�b genvejsgruppen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "�ndr valgt genvejsgruppe til:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Vis genveje som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Vis genveje som store ikoner"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppe..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Fjern denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Omd�b denne gruppe..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Omd�b denne genvejsgruppe"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Skjul genvejslinjen"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Opret en ny genvej"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Opret en ny genvej"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Omd�b genvej"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Omd�b valgt genvej til:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "�bn mappen som denne genvej henviser til"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "�bn i nyt _vindue"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "Omd�b"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Omd�b denne genvej"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne genvej fra genvejslinjen"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fejl ved gemning af genveje."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Genveje"
 
@@ -25369,55 +25614,55 @@ msgstr "Genveje"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Ingen fejl"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Specificeret mappetype er ikke gyldig"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/U-fejl"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plads til at oprette mappen"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Specificeret mappe blev ikke fundet"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funktionen er ikke implementeret i dette lager"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operationen er ikke underst�ttet"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Specificeret type er ikke underst�ttet for dette lager"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Specificeret mappe kan ikke �ndres eller fjernes"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke g�re en mappe til barn af en af sine efterkommere"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Kan ikke oprette en mappe med det navn"
 
@@ -25472,63 +25717,63 @@ msgstr ""
 "Fejlen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA-fejl"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Afbrudt"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ugyldige argumenter"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Har en ejer allerede"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Ingen ejer"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Ikke fundet"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "En ikke-underst�ttet type"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Et ikke underst�ttet skema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "En ikke-underst�ttet handling"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Ingen plads tilbage"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Tidligere ejer er d�d FIXME"
 
@@ -25553,6 +25798,26 @@ msgstr "V�rt"
 msgid "The following connections are currently active:"
 msgstr "F�lgende forbindelser er aktive:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakter: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_E-post"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Opgaver"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenavn:"
@@ -25565,6 +25830,34 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Specific�r hvor mappen skal oprettes:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Opret _ny mappe..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Mappenavn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Servernavn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Br_ugernavn:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Ops�tningsassistent for Evolution"
@@ -25661,15 +25954,15 @@ msgstr "Sp�rg mig ikke igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra f�lgende filer:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution afslutter nu..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25689,53 +25982,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Sp�rg mig ikke igen"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke tilg� Ximian Evolution-skallen."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Deaktiv�r splash"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Starter import"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Starter intelligent importering"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejls�gingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
@@ -25772,116 +26065,110 @@ msgstr "Kopier udvalget"
 msgid "Copy to Folder..."
 msgstr "K_opi�r til mappe..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Opret en ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Opret en ny kontaktliste"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klip udvalget ud"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Slet valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Flyt valgte beskeder til en anden mappe"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Inds�t fra klippebordet"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forh�ndsviser kontakterne som skal skrives ud"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Forh�ndsvisning af udskrift"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Udskriv valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Gem valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "V�lg alt"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "V�lg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Send en besked til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send besked til kontakt"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en anden person."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Stop indl�sning"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "tiden nu"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktliste"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Gem _som VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_S�g efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_V�lg alt"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Send _besked til kontakt..."
@@ -25926,11 +26213,6 @@ msgstr "M�ned"
 msgid "Previews the calendar to be printed"
 msgstr "Forh�ndsviser kalenderen som skal skrives ud"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Forh�ndsvisning af udskrift"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Udskriv denne kalender"
@@ -25963,7 +26245,7 @@ msgstr "Uge"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Luk"
 
@@ -25976,7 +26258,7 @@ msgid "Delete this item"
 msgstr "Slet denne opf�ring"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hovedv�rkt�jslinje"
 
@@ -25988,8 +26270,8 @@ msgstr "Forh�ndsvisning af opf�ring som skal skrives ud"
 msgid "Print this item"
 msgstr "Udskriv denne opf�ring"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Gem"
 
@@ -26014,9 +26296,9 @@ msgstr "Gem denne opf�ring p� disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fil"
 
@@ -26026,7 +26308,7 @@ msgstr "Udskriv konvolut..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Gem _som..."
 
@@ -26040,8 +26322,8 @@ msgstr "Send _besked til kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Gem"
 
@@ -26138,26 +26420,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Ny besked"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Gemmer besked til mappe"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Vis vindue for forh�ndsvisning af besked"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonn�r eller fjern abonnement p� mapper p� eksterne servere"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering af virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Forh�ndsvisningsvindue"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Abonn�r p� mapper..."
 
@@ -26254,7 +26546,7 @@ msgstr "Beskedsliste med tr�de"
 msgid "_Expunge"
 msgstr "_Fjern slettede beskeder"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "M_appe"
 
@@ -26515,182 +26807,197 @@ msgstr "Forrige ul�ste besked"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Svar p� opgave"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Se efter nye beskeder i alle mapper"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Forrige vigtige besked"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Forh�ndsvis beskeden som skal skrives ud"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Udskriv denne besked"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Videresend den valgte besked til nogen"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Nulstil tekstst�rrelsen til den oprindelige"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "S�g i b_esked..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_mindre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Gem beskeden som en tekstfil"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "S�g efter tekst i kroppen af vist besked"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Redig�r sideindstillinger for aktiv skriver"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Vis e-post-kilde"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Vis brevets _kildetekst"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Vis besked i normal stil"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Vis besked med fulde e-post headere"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Vis e-post beskeden i sin r� form"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Tekst st�rre_lse"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Fortryd sletning af den valgte besked"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuel mappe for e-post_liste..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Virtuel mappe for afse_nder..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Virtuel mappe for modtage_re..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Virtuel mappe for e_mne..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Vedl�g"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopi�r til mappe"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Videresend besked"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "G� til"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Indlejret"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_St�rre"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "N�ste besked"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_�bn besked"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Forrige besked"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citeret"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Omd�b..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_V�rkt�jer"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "L_uk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vis"
 
@@ -26718,169 +27025,161 @@ msgstr "Krypt�r denne besked med dit S/MIME krypteringscertifikat"
 msgid "For_mat"
 msgstr "For_mat�r"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Indlejret tekst_fil..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Inds�t en tekstfil i beskeden"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Inds�t tekstfil..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "�bn"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "�bn en fil"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Krypt�r med PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Sign�r med PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Krypt�r med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Sign�r med S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gem som"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "_Gem udkast"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Gem i mappe..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Gem aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Gem aktiv fil med et nyt navn"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Gem beskeden i en specificeret mappe"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Send se_nere"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Send beskeden i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Send beskeden senere"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Send denne besked nu"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Vis/skjul bilag"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Vis _bilag"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Vis bilag"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Sign�r denne besked med din PGP-n�gle"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign�r denne besked med dit S/MIME signaturcertifikat"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Sl� visning af BCC-feltet fra/til"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Sl� visning af CC-feltet fra/til"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Sl� visning af Fra-feltet fra/til"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Sl� visning af Svar-til feltet fra/til"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Bilag..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Slet alle"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Fra-felt"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Inds�t"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_�bn..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Svar-til felt"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Gem opf�ringen og luk dialogboksen"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hj�lp"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Gem signatur"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Tilf�j mappe p� listen over abonnerede mapper"
@@ -26978,171 +27277,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Tilf�j p� _genvejslinje"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "�ndr navn p� denne mappe"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopi�r denne mappe"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Opret _ny mappe..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Lav en henvisning til denne mappe p� genvejslinjen"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Opret en ny mappe"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Opret en ny genvej"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Opret en ny mappe"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Slet denne mappe"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Vis en anden mappe"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "A_fslut"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _vindue"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Import�r data fra andre programmer"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Flyt denne mappe til et andet sted"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Opret _ny mappe..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "�bn i nyt vindue"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "�bn denne mappe i et andet vindue"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Indstillinger for _h�hdholdt..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�lagt e-post og hent ny e-post"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "E-post-konfiguration"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Skift"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Sl� visning af mappelinjen fra/til"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Sl� visning af genvejslinjen fra/til"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Vis den valgte mappe"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _OSS"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopi�r..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Mappelinje"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "M_appe"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Import�r..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Flyt..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Indstillinger for _h�hdholdt..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "I_ngen genindtr�ffelse"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Omd�b..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Genvej"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Genvejslinje"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Genvej"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Udskriv sammendrag"
@@ -27156,17 +27486,40 @@ msgid "Reload the view"
 msgstr "Genindl�s visningen"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adressekort"
+#, fuzzy
+msgid "By _Company"
+msgstr "Efter firma"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Efter firma"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adressekort"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonliste"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Ugevisning"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dagvisning"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "M�nedsvisning"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Arbejdsugevisning"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27192,13 +27545,19 @@ msgstr "Efter emne"
 msgid "Messages"
 msgstr "Beskeder"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Med kategori"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Opgave"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27352,11 +27711,11 @@ msgstr "Tegnkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Redigering af s�gning"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Gem s�gning"
 
@@ -27396,21 +27755,21 @@ msgstr "Besked"
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Find nu "
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Find nu "
 
@@ -27424,18 +27783,155 @@ msgstr "Personlig adressebogs-server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebogs-server; fabrik"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunne ikke initiere GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution kan ikke finde det lokale lager for adressebog. \n"
+#~ "Dette kan v�re for�rsaget af, at Evolution-adressebogs-komponenten er "
+#~ "g�et ned. \n"
+#~ "For at hj�lpe os med at forst� og til slut l�se problemet, \n"
+#~ "m� du gerne sende en besked til Jon Trowbridge <trow@ximian.com> med en \n"
+#~ "detaljeret beskrivelse af omst�ndighederne omkring fejlen. Tak."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution kan ikke finde det lokale lager for adressebog. \n"
+#~ "Under normale omst�ndigheder ville dette aldrig ske. \n"
+#~ "Du beh�ver m�ske at forlade og genstarter Evolution for at \n"
+#~ "l�se dette problem."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Flyt..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "M�destatus er �ndret. Send en opdateret version?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Sle_t denne aftale"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/U-fejl"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Fejl ved Velkomst-svar: %s: muligvis ikke-fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Tidsafbrud for HELO-foresp�rgsel: %s: ikke-fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Fejl ved HELO-svar: %s: ikke-fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Tidsafbrud for QUIT-foresp�rgsel: %s: ikke-fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Inds�t fil"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Du har valgt en ugyldig dato."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Beskedens dato vil blive sammenlignet med tiden\n"
+#~ "n�r filteret k�res eller tiden n�r vfolderen\n"
+#~ "�bnes."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution nyhedsredigerer"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Er du sikker p� at du vil slette denne nyhedsgruppekonto?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Du skal konfigurere en konto f�r du kan sende denne besked."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP-server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Nyhedstjenester"
+
+#~ msgid "Source"
+#~ msgstr "Kilde"
+
+#~ msgid "Source Information"
+#~ msgstr "Kildeinformation"
+
+#~ msgid "newswindow1"
+#~ msgstr "nyhedsvindue1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Gem til disk..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Gem besked som..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Opret ny mappe"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Typen for valgt mappe er ikke gyldig for den\n"
+#~ "forespurgte operation."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Du kan kun importere til lokale mapper"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktliste"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Indlejret tekst_fil..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Inds�t en tekstfil i beskeden"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Inds�t tekstfil..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send _later"
+#~ msgstr "Send se_nere"
+
+#~ msgid "Send the message later"
+#~ msgstr "Send beskeden senere"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Indstillinger for _h�hdholdt..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adressebog-kilder"
@@ -27578,10 +28074,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Slet alt undtaget signatur"
 
@@ -27951,12 +28443,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republikken Moldova"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Opret en ny aftale"
-
-#~ msgid "Create a new task"
-#~ msgstr "Opret en ny opgave"
-
 #~ msgid "New _Task"
 #~ msgstr "Ny _opgave"
 
@@ -28059,9 +28545,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ "Dette lader dig koble til POP-serveren ved at bruge Kerberos 4 som "
 #~ "autenticering."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Kunne ikke autenticere mod KPOP-server: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Kunne ikke koble til server: %s"
 
@@ -28104,9 +28587,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Mappe for beskedslager (intern)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Kunne ikke koble til lager: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Ny e-post _besked"
 
@@ -28158,9 +28638,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Husk denne adgangs_kode"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Send beskeder i HTML-format som standard."
 
@@ -28242,9 +28719,6 @@ msgstr "init_bonobo(): kunne ikke initialisere Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Opret eller redig�r e-post konti og andre brugervalg"
 
-#~ msgid "New Message"
-#~ msgstr "Ny besked"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "Indstillinger for e-post..."
 
diff --git a/po/de.po b/po/de.po
index cf4116154b..59f088ed26 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1cvs\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-05-22 21:30GMT\n"
 "Last-Translator: Manuel Borchers <webmaster@matronix.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -40,7 +40,7 @@ msgstr "Importiert VCard-Dateien in Evolution."
 msgid "File As"
 msgstr "Einsortieren unter"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Name"
@@ -348,45 +348,45 @@ msgstr "VCard f�r %s"
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Suchen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Laden..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Fehler im Suchausdruck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Karte zu LDAP-Server hinzuf�gen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Karte von LDAP-Server entfernen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Karte auf LDAP-Server �ndern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Suche wird neu gestartet."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Empfangen von LDAP-Suchergebnissen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Fehler beim Ausf�hren der Suche"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Abfragezeichenkette konnte nicht geparst werden"
 
@@ -479,11 +479,11 @@ msgstr ""
 "Protokoll verwenden, benutzt werden"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -499,22 +499,31 @@ msgstr "LDAP-Server:"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-Server mit Kontaktinformationen"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Neuer Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Einen neuen Kontakt anlegen"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Neu Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Neuer Kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Neuen Kontaktliste anlegen"
 
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
@@ -532,24 +541,24 @@ msgstr "Abfrage auf Root DSE konnte nicht ausgef�hrt werden"
 msgid "The server responded with no supported search bases"
 msgstr "Der Server antwortete mit nicht unterst�tzen Suchbasen"
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Dieser Server unterst�tzt keine LDAPv3 Schema-Information"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 msgid "Error retrieving schema information"
 msgstr "Fehler beim Empfangen von Schema-Information"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr "Server antwortetet nicht mit einer g�ltigen Schema-Information"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "LDAP wurde in diesem Build von Evolution nicht aktiviert"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs konnte nicht initialisiert werden"
 
@@ -557,11 +566,11 @@ msgstr "gnome-vfs konnte nicht initialisiert werden"
 msgid "Other Contacts"
 msgstr "Andere Kontakte"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Das Adressbuch kann nicht ge�ffnet werden"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -571,7 +580,7 @@ msgstr ""
 "bedeutet entweder, dass Sie einen ung�ltigen URI eingegeben\n"
 "haben oder dass der LDAP-Server unerreichbar ist."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -584,7 +593,7 @@ msgstr ""
 "nachdem Sie sich von der Adresse unten OpenLDAP besorgt\n"
 "haben.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -592,42 +601,42 @@ msgstr ""
 "Dieses Adressbuch konnte nicht ge�ffnet werden. Bitte pr�fen Sie\n"
 "nach, ob der Pfad existiert und ob Sie darauf zugreifen d�rfen."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Passwort f�r %s (Benutzer %s) eingeben"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-Mail ist"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Irgend ein Feld enth�lt"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Komplex..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -744,7 +753,7 @@ msgstr "Attributzuordnungen hinzuf�gen (oder bearbeiten)"
 msgid "Addressbook Sources"
 msgstr "Adressbuch-Quellen"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Immer"
@@ -836,8 +845,8 @@ msgstr "LDAP-Konfigurationsassistent"
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nie"
 
@@ -896,8 +905,8 @@ msgstr "Suchb_ereich: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Suchen"
 
@@ -1147,15 +1156,15 @@ msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Immer, wenn m�glich"
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Hinzuf�gen"
 
@@ -1195,12 +1204,12 @@ msgstr "SSL/TLS _nicht verwenden"
 msgid "_Download limit:"
 msgstr "_Downloadbegrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Bearbeiten"
@@ -1303,10 +1312,10 @@ msgstr "Fabrik f�r die Namenauswahl-Schnittstelle des Adressbuchs"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1335,43 +1344,14 @@ msgstr "(%d nicht gezeigt)"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid "Find contact in"
-msgstr "Kontakt finden in"
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution kann nicht auf den lokalen Adressbuchspeicher\n"
-"zugreifen. Dies k�nnte durch den Absturz der Komponente\n"
-"evolution-addressbook verursacht worden sein. Um uns zu helfen,\n"
-"dieses Problem besser zu verstehen und irgendwann zu l�sen,\n"
-"schicken Sie bitte eine E-Mail mit einer detaillierten\n"
-"Beschreibung der Umst�nde, unter denen dieser Fehler auftrat,\n"
-"an Jon Trowbridge <trow@ximian.com>. Danke."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution kann nicht auf den lokalen Adressbuchspeicher\n"
-"zugreifen. Unter normalen Umst�nden sollte dies nicht\n"
-"passieren. Sie werden Evolution beenden und neustarten\n"
-"m�ssen, um das Problem zu beheben."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "Kontakte aus Adressbuch w�hlen"
 
+#: addressbook/gui/component/select-names/e-select-names.c:544
+msgid "Find contact in"
+msgstr "Kontakt finden in"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Namen w�hlen"
@@ -1393,14 +1373,10 @@ msgstr ""
 "w�hlen Sie einen aus der Liste aus:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr "_Durchsuchen..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Ordner:"
 
@@ -1505,11 +1481,12 @@ msgstr "Will HTML-Mail erhalten"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "L�schen"
 
@@ -2746,7 +2723,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Adressen _verbergen, when Mail an diese Liste gesendet wird"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -2810,7 +2787,7 @@ msgstr ""
 "trotzdem hinzuf�gen?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
@@ -2837,21 +2814,21 @@ msgid "Error getting book view"
 msgstr "Fehler beim Empfangen der Buchansicht"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fehler beim �ndern einer Karte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Erfolg"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -2859,8 +2836,8 @@ msgstr "Unbekannter Fehler"
 msgid "Repository offline"
 msgstr "Repository offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
@@ -2877,7 +2854,7 @@ msgid "Protocol not supported"
 msgstr "Protokoll nicht unterst�tzt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2900,46 +2877,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Datei %s existiert nicht"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Wollen Sie die �nderungen speichern?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Fehler beim Hinzuf�gen der Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Fehler beim Hinzuf�gen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Fehler beim �ndern einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fehler beim Entfernen einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Karten anzeigen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Karten anzeigen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2949,19 +2931,19 @@ msgstr ""
 "Sie haben %d Karten angefordert. Dies wird %d neue Fenster auf ihrem "
 "Bildschirm �ffnen. Wollen Sie wirklich alle Karten anzeigen lassen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Karte verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Karte kopieren nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Karten verschieben nach"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Karten kopieren nach"
 
@@ -3033,7 +3015,7 @@ msgstr "Adressbuch"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
 
@@ -3066,7 +3048,7 @@ msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
@@ -3075,8 +3057,8 @@ msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drucken"
@@ -3094,7 +3076,7 @@ msgid "Move to folder..."
 msgstr "In Ordner verschieben..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
@@ -3105,20 +3087,20 @@ msgid "Copy"
 msgstr "Kopieren"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Einf�gen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "L�schen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -3282,7 +3264,7 @@ msgstr "R�nder"
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Optionen"
 
@@ -3372,26 +3354,26 @@ msgstr "Unbenannter Termin"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Niedrig"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Undefiniert"
@@ -3511,11 +3493,11 @@ msgstr "Weiterschlaf-Zeit (Minuten)"
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Keine Beschreibung verf�gbar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3528,13 +3510,13 @@ msgstr ""
 "wird statt dessen eine normales Erinnerungsdialogfenster\n"
 "anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3551,7 +3533,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausf�hren wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Mich �ber dieses Programm nicht mehr fragen."
 
@@ -3579,7 +3561,7 @@ msgstr "Beschreibung enth�lt"
 msgid "Comment contains"
 msgstr "Kommentar enth�lt"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Nicht passend"
 
@@ -3590,7 +3572,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3612,19 +3594,19 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Die Kalender-Ansicht konnte nicht erstellt werden. Bitte �berpr�fen Sie Ihre "
 "ORBit und OAF Einstellungen. "
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertraulich"
@@ -3649,37 +3631,37 @@ msgstr "O"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Frei"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Besch�ftigt"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nicht gestartet"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3690,56 +3672,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Keine"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nein"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Werkwochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Monatsansicht"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3747,12 +3728,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Ordner mit Terminen und Ereignissen"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Aufgaben"
 
@@ -3760,37 +3741,55 @@ msgstr "Aufgaben"
 msgid "Folder containing to-do items"
 msgstr "Ordner mit To-Do-Eintr�gen"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Neuer Termin"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Termin"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Einen neuen Termin anlegen"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Eine neue Aufgabe anlegen"
+
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "Neuer Ganztags-Termin"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "Ganz_tags-Termin"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Neuer Termin"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Termin"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Einen neuen Termin anlegen"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3858,7 +3857,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "Tage"
 
@@ -3866,11 +3866,13 @@ msgstr "Tage"
 msgid "extra times every"
 msgstr "weitere Male alle"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "Minuten"
 
@@ -3998,7 +4000,7 @@ msgstr "Erinnerungen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -4027,7 +4029,7 @@ msgstr "Ende des Termins"
 msgid "hour(s)"
 msgstr "Stunde(n)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4203,7 +4205,7 @@ msgid "_Fri"
 msgstr "_Fr"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4245,22 +4247,34 @@ msgstr "_Mi"
 msgid "before every appointment"
 msgstr "vor Terminbeginn"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
-"Der Status der Besprechung hat sich ge�ndert. Aktualisierte Version "
-"verschicken?"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Sind Sie sicher, dass Sie diese Besprechung absagen und l�schen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe stornieren und l�schen wollen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Sind Sie sicher, dass Sie diesen Journaleintrag stornieren und l�schen "
@@ -4334,59 +4348,59 @@ msgstr " (F�llig am "
 msgid "Due "
 msgstr "F�llig am "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 msgid "Could not update invalid object"
 msgstr "Ung�ltiges Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr "Objekt nicht gefunden, wurde nicht aktualisiert"
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr "Sie haben keine Berechtigung dieses Objekt zu aktualisieren"
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Aktuelle Version kann nicht erhalten werden!"
 
@@ -4586,7 +4600,7 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
@@ -4598,7 +4612,7 @@ msgstr "Position"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4684,7 +4698,7 @@ msgstr "bei"
 msgid "first"
 msgstr "erster"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "zweiter"
 
@@ -4704,7 +4718,7 @@ msgstr "letzter"
 msgid "Other Date"
 msgstr "Anderes Datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "Tag"
 
@@ -4806,20 +4820,26 @@ msgstr "% abgeschlossen"
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Erfordert Ma�nahme"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Priorit�t:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "Status:"
 
@@ -4833,7 +4853,7 @@ msgstr "Grundlegend"
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4902,76 +4922,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Ausgew�hlte Objekte werden gel�scht"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�_ffnen"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Speichern unter..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Einf�gen"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "_Aufgabe zuweisen"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "Als i_Calendar weiterleiten"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ausgew�hlte Aufgaben als abgeschlossen _markieren"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Ausgew�hlte Aufgaben _l�schen"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
@@ -4980,8 +5000,8 @@ msgstr "Klicken, um eine Aufgabe hinzuzuf�gen"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Abgeschlossen"
 
@@ -5009,11 +5029,9 @@ msgstr "Priorit�t"
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -5055,107 +5073,106 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Neuer _Termin"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Neues ganzt�giges _Ereignis"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drucken..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen _ver�ffentlichen"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Konfigurieren..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "Pilot _konfigurieren..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Speichern _unter..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Dieses Auftreten _beweglich machen"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Dieses _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Jedes _Auftreten l�schen"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausf�hren von %s."
@@ -5196,7 +5213,7 @@ msgstr "Aufgabe vollst�ndig zu: <b>"
 msgid "Task Due: <b>"
 msgstr "Aufgabe f�llig am: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iKalender-Information"
 
@@ -5205,12 +5222,12 @@ msgstr "iKalender-Information"
 msgid "iCalendar Error"
 msgstr "iKalender-Fehler"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5218,321 +5235,326 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "w�hlen Sie dann eine Aktion aus dem Men� unten aus."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Ge_ographischer Ort: "
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Vorl�ufig angenommen"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Eine Aktion w�hlen:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Vorl�ufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen senden"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Neueste Informationen senden"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> w�nscht Ihre Anwesenheit bei einer Besprechung"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> w�nscht zu einer vorhandenen Besprechung hinzuzuf�gen"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> w�nscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung widerrufen."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Besprechungswiderruf"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverst�ndliche Nachricht gesendet."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> fordert Sie auf eine Aufgabe auszuf�hren."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> w�nscht zu einer bestehenden Aufgabe hinzuzuf�gen."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> w�nscht letzte Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe widerrufen."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Aufgabenwiderruf"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verf�gbarkeitsinformationen ver�ffentlicht."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verf�gbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Verf�gbarkeits-Anfrage"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeits-Anfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Verf�gbarkeits-Antwort"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verf�gbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enth�lt ausschlie�lich nicht unterst�tzte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enth�lt keine g�ltige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalenderinformationen"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ung�ltig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr "Sie haben keine Berechtigung den Kalender zu aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Anwesenheitsstatus kann nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Diese Antwort ist von keinem Teilnehmer.  Als Teilnehmer hinzuf�gen?"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Anwesenheitsstatus konnte auf Grund eines ung�ltigen Status nicht "
 "aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Anwesenheitsstatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr "Ordner f�r Kalender w�hlen"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr "Ordner f�r Aufgaben w�hlen"
 
@@ -5577,7 +5599,7 @@ msgstr "datum-anfang"
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Ben�tigte Teilnehmer"
 
@@ -5590,57 +5612,52 @@ msgid "Non-Participants"
 msgstr "Nicht-Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Raum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Ben�tigter Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Erfordert Ma�nahme"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Vorl�ufig"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegiert"
 
@@ -5730,47 +5747,44 @@ msgstr "Anfang der Besprechung:"
 msgid "Meeting _end time:"
 msgstr "Ende der Besprechung:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben bei %s werden ge�ffnet"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Die Aufgaben in `%s' konnten nicht geladen werden"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 "Die Methode, die zum Laden von `%s' ben�tigt wird, ist nicht unterst�tzt"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Sie haben keine Berechtigung den Ordner in `%s' zu �ffnen"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr "Ausgew�hlte Objekte werden gel�scht..."
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Wird ges�ubert"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "Diesen Termin _l�schen"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5782,11 +5796,16 @@ msgid "The method required to open `%s' is not supported"
 msgstr ""
 "Die Methode, die zum �ffnen von `%s' ben�tigt wird, wird nicht unterst�tzt"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Kalender bei %s wird ge�ffnet"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Ordner %s �ffnen"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5843,52 +5862,57 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Mindestens ein Teilnehmer wird ben�tigt"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Ein Organisator muss feststehen."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Ereignisinformationen"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Journalinformationen"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Verf�gbarkeitsinformationen"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformationen"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Aktualisieren"
 
 # CHECK
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Gegenvorschlag"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Sie m�ssen ein Teilnehmer des Ereignisses sein."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo konnte nicht initialisiert werden"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Komponenteneditor-Fabrik konnte nicht angelegt werden"
 
@@ -6115,9 +6139,8 @@ msgid "Print Calendar"
 msgstr "Kalender drucken"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -6153,8 +6176,8 @@ msgstr ""
 "\n"
 "Aufgaben wirklich entfernen?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Mich nicht mehr fragen."
 
@@ -6216,15 +6239,27 @@ msgstr "Importiert iCalendar-Dateien in Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importiert vCalendar-Dateien in Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nachricht kann nicht erhalten werden: %s aus Ordner %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr "Erinnerung!!"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6232,85 +6267,85 @@ msgstr ""
 "Evolution hat Gnome Calendar-Dateien gefunden.\n"
 "M�chten Sie sie in Evolution importieren?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time erwartet 1 Argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time erwartet eine Datum-/Zeit-Zeichenkette nach ISO 8601 als 1. "
 "Argument"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day erwartet zwei Argumente"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day erwartet eine Ganzzahl als 2. Argument"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin erwartet 1 Argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end erwartet 1 Argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? erwartet einen time_t-Wert als 2. Argument"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? erwartet 2 Argumente"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 1. Argument"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? erwartet eine Zeichenkette als 2. Argument"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6318,11 +6353,11 @@ msgstr ""
 "contains? erwartet als 1. Argument entweder \"any\", \"summary\" oder "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? erwartet mindestens 1 Argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6330,19 +6365,19 @@ msgstr ""
 "has-categories? erwartet Zeichenketten als Argumente oder aber ein einziges "
 "Argument, das dem Wahrheitswert 'falsch' (#f) entspricht"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? erwartet 0 Argumente"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? erwartet 1 Argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? erwartet einen time_t-Wert als 1. Argument"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Auswertung des Suchausdrucks ergab keinen Wahrheitswert"
 
@@ -7939,71 +7974,81 @@ msgstr "Ordner '%s' wird gespeichert"
 msgid "You must be working online to complete this operation"
 msgstr "Sie m�ssen online arbeiten, um diesen Vorgang zu Ende zu bringen"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Ordner werden synchronisiert"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fehler beim Verarbeiten des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fehler beim Ausf�hren des Filters: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Der Spool-Ordner kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Der Spool-Ordner kann nicht verarbeitet werden"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Nachricht %d wird abgerufen (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nachricht kann nicht ge�ffnet werden"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fehlgeschlagen bei Nachricht %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Ordner wird synchronisiert"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Nachricht %d von %d wird abgerufen"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nachricht konnte nicht empfangen werden"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Ung�ltige Argumente"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Ung�ltige Argumente"
+
+#: camel/camel-filter-search.c:511
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "\"Pipe\" zu '%s'  konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kindprozess '%s' konnte nicht erstellt werden: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausf�hren einer Filtersuche: %s: %s"
@@ -8058,7 +8103,7 @@ msgstr "Nachrichten werden verschoben"
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8066,47 +8111,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Storniert"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete Antwort von POP-Server: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Kein Dateiname angegeben."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nachricht kann nicht verschl�sselt werden: keine Empf�nger angegeben"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8114,18 +8159,18 @@ msgid ""
 "%.*s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nachricht konnte nicht dekodiert werden."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8153,24 +8198,24 @@ msgid "Could not lock '%s'"
 msgstr "'%s' konnte nicht gesperrt werden"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lock-Datei f�r %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Zeit�berschreitung beim Versuch, eine Lock-Datei auf %s zu erhalten. "
 "Versuchen Sie es sp�ter noch einmal."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
@@ -8229,11 +8274,15 @@ msgstr "Fehler beim Schreiben der tempor�ren Maildatei: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fehler beim Kopieren der tempor�ren Maildatei: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8371,7 +8420,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Ung�ltige Legitimationsantwort vom Server."
 
@@ -8545,33 +8594,134 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner kann nicht angelegt werden: Ung�ltige Aktion auf diesem Speicher"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Zertifikate konnten nicht verifiziert werden."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Ausgabestelle: %s\n"
-"Betreff: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Zertifikate konnten nicht verifiziert werden."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
 msgstr ""
-"Ung�ltiges Zertifikat von %s:\n"
-"\n"
-"%s\n"
-"\n"
-"M�chten Sie trotzdem akzeptieren?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Signaturdatei w�hlen"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "Kennung des _Zertifikats:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Fehler beim Laden von %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Au�er Haus"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Zertifikate konnten nicht verifiziert werden."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "Kennung des _Zertifikats:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ung�ltiges Argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "Kennung des _Zertifikats:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "Kennung des _Zertifikats:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8584,16 +8734,33 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "SCHLECHT"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Ung�ltiges Zertifikat von %s:\n"
+"\n"
+"%s\n"
+"\n"
+"M�chten Sie trotzdem akzeptieren?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8613,31 +8780,36 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' konnte nicht geparst werden"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Fehler beim Starten von %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s gibt es in %s nicht"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Es kann nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner kann nicht gel�scht werden: %s: Ordner gibt es nicht"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ung�ltige Aktion"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
@@ -8645,12 +8817,12 @@ msgstr "Ordner konnte umbenannt werden: %s: Ordner gibt es nicht"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verbindung zum Server unerwartet getrennt: %s"
@@ -8679,40 +8851,40 @@ msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung f�r %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerst�rt und auf dem Server neu erstellt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Suchen nach ge�nderten Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzei nicht verf�gbar"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "�berblickinformation f�r neue Nachrichten wird abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -8721,10 +8893,10 @@ msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 msgid "Could not open cache directory: %s"
 msgstr "Cache-Verzeichnis konnte nicht ge�ffnet werden: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nachricht %s konnte nicht gecacht werden: %s"
@@ -8737,7 +8909,7 @@ msgstr "Nach neuer Mail sehen"
 msgid "Check for new messages in all folders"
 msgstr "In allen Ordnern nach neuer Mail sehen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Ordner"
 
@@ -8767,7 +8939,7 @@ msgstr "Zum Lesen und Speichern von Mail auf IMAP-Servern."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Passwort"
 
@@ -8777,70 +8949,74 @@ msgstr ""
 "Diese Option verbindet zum IMAP-Server mit einem unverschl�sselten "
 "Passwortes."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s-Dienst f�r %s auf %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS Erweiterung nicht unterst�tzt."
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL \"Verhandlungen\" fehlgeschlagen"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Der Ordner ist nicht leer"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "IMAP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterst�tzung f�r Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8851,31 +9027,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s gibt es nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Ordnername darf das Return-Zeichen nicht enthalten."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postfach kann nicht ge�ffnet werden: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8897,7 +9079,10 @@ msgid "Local delivery"
 msgstr "Lokale Auslieferung"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Zum Empfangen lokaler Mail aus Spools im Standard-mbox-Format."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8925,12 +9110,12 @@ msgstr "Standard-Unix-mbox-Spools"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Zum Lesen und Speichern lokaler Mail in normalen mbox-Spooldateien."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8941,38 +9126,38 @@ msgstr "Speicherungswurzel %s ist kein absoluter Pfad"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ordner kann nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Posteingangsordner"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale Maildatei %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ordner-Indexdatei `%s' konnte nicht gel�scht werden: %s"
@@ -9033,7 +9218,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9071,24 +9256,24 @@ msgstr "kein maildir-Verzeichnis"
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner `%s' konnte nicht abgetastet werden: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir-Verzeichnispfad kann nicht ge�ffnet werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Konsistenz des Ordners wird �berpr�ft"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Suchen nach neuen Nachrichten"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ordner wird gespeichert"
@@ -9132,7 +9317,7 @@ msgstr "Dieser Ordner scheint nicht-wiederherstellbar korrupt zu sein."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Nachrichtenerstellung fehlgeschlagen: Defektes Postfach?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9141,7 +9326,7 @@ msgstr ""
 "Datei `%s' konnte nicht ge�ffnet werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9150,14 +9335,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine regul�re Datei."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9166,7 +9351,7 @@ msgstr ""
 "Ordner `%s' konnte nicht gel�scht werden:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gel�scht."
@@ -9181,65 +9366,65 @@ msgstr "Ordner konnte nicht ge�ffnet werden: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fataler Mailparser-Fehler nahe Position %ld in Ordner %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ordner kann nicht gepr�ft werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Tempor�res Postfach konnte nicht angelegt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 "Zusammenfassungs- und Order-Pr�ffehler, sogar nach einer Synchronisation"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf tempor�res Postfach: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fehler beim Schreiben auf tempor�res Postfach %s: %s"
@@ -9390,47 +9575,47 @@ msgstr "Abbrechen benutzen"
 msgid "Operation failed: %s"
 msgstr "Operation fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Abrufen der POP-Zusammenfassung"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Benutzer hat abgebrochen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP-Zusammenfassung kann nicht empfangen werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Gel�schte Nachrichten werden ausger�umt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Abrufen der POP-Nachricht %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nachricht %s kann nicht erhalten werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -9447,7 +9632,7 @@ msgstr "Mail auf Server belassen"
 msgid "Delete after %s day(s)"
 msgstr "Nach %s Tag(en) l�schen"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9473,6 +9658,11 @@ msgstr ""
 "�ber das APO-Protokoll verbinden. Dies funktioniert evtl. nicht f�r alle "
 "Benutzer, sogar auf Servern, die behaupten, es zu unterst�tzen."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9481,55 +9671,57 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Konnte nicht mit Server %s im sicheren Modus verbunden werden: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
-#, c-format
-msgid "Could not connect to POP server on %s"
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "Verbindung zu POP-Server auf %s konnte nicht hergestellt werden"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Keine Unterst�tzung f�r den verlangten Legitimationsmechanismus."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login fehlgeschlagen: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL-Protokollfehler"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "E-/A-Fehler: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sBitte geben Sie das POP3-Passwort f�r %s@%s ein"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9556,35 +9748,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail konnte nicht geforkt werden: %s: Mail nicht verschickt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nachricht konnte nicht verschickt werden: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail brach mit Signal %s ab: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s konnte nicht ausgef�hrt werden: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail gab Status %d zur�ck: Mail nicht verschickt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "Mailauslieferung �ber das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9693,42 +9885,42 @@ msgstr "Zeitweiliger Legitimationsfehlschlag"
 msgid "Authentication required"
 msgstr "Legitimation ben�tigt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "QUIT-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Verbindung mit SMTP-Server %s im sicheren Modus ist fehlgeschlagen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr "Server scheint kein SSL zu unterst�tzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zeit�berschreitung bei STARTTLS-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr "STARTTLS-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "SMTP-Server %s unterst�tzt den verlangten Legitimationsmechanismus %s nicht."
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sBitte geben Sie das SMTP-Passwort f�r %s@%s ein"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9739,91 +9931,91 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-Server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-Mailauslieferung �ber %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Nachricht verschicken"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nachricht konnte nicht verschickt werden: Keine Empf�nger angegeben."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Nachricht konnte nicht verschickt werden: ein oder mehrere ung�ltige "
 "Empf�nger"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP-Begr��ung"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zeit�berschreitung bei HELO-Anfrage: %s: nicht fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO-Antwortfehler: %s: nicht fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET-Antwort-Fehler"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP-Legitimation"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Fehler beim Anlegen eines SASL-Legitimations-Objektes."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH-Anfrage fehlgeschlagen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Ung�ltige Legitimationsantwort vom Server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei MAIL-FROM-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "MAIL-FROM-Antwortfehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei RCPT-TO-Anfrage: %s: Mail nicht verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fehlgeschlagen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
@@ -9831,88 +10023,88 @@ msgstr "Zeit�berschreitung bei DATA-Anfrage: %s: Mail nicht verschickt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "DATA-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zeit�berschreitung beim Senden von DATA: Nachrichtenabschluss: %s Mail nicht "
 "verschickt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "DATA-Terminierungsantwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zeit�berschreitung bei RSET-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "RSET-Antwort-Fehler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zeit�berschreitung bei QUIT-Anfrage: %s: nicht fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Zeit�berschreitung bei AUTH-Anfrage: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "QUIT-Antwort-Fehler"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 Byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u Bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f kB"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1f MB"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Das gew�hlte Element aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Anlage hinzuf�gen..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Datei kann nicht beigelegt werden: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Datei %s kann nicht beigelegt werden: keine regul�re Datei"
@@ -9930,56 +10122,60 @@ msgid "MIME type:"
 msgstr "MIME-Typ:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "F�r das Adressbuch hier klicken"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Von:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Von:"
+
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "An:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Gebe die Empf�nger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Gebe die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9987,17 +10183,25 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "Empf�ngerliste auftaucht."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Port:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP-Signaturkontext konnte nicht angelegt werden."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10006,34 +10210,34 @@ msgstr ""
 "Fehler beim Lesen der Datei %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Datei existiert, �berschreiben?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fehler beim Zugriff auf Datei: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nachricht konnte nicht vom Editor erhalten werden"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10042,7 +10246,7 @@ msgstr ""
 "In Datei konnte nicht gesucht werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10051,7 +10255,7 @@ msgstr ""
 "Datei konnte nicht verk�rzt werden: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10060,7 +10264,7 @@ msgstr ""
 "Fehler beim automatischen Speichern der Nachricht: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10069,7 +10273,7 @@ msgstr ""
 "entdeckt.\n"
 "M�chten Sie eine Wiederherstellung versuchen?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10079,43 +10283,39 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre �nderungen speichern?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Datei �ffnen"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Datei einf�gen"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Signatur speichern"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "Vo_rgaben wiederherstellen"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10123,7 +10323,7 @@ msgstr ""
 "Erstellungsfenster konnte nicht angelegt werden:\n"
 "Adressw�hler-Control konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10131,9 +10331,10 @@ msgstr ""
 "Es konnte kein Erstellungsfenster angelegt werden:\n"
 "HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
+#, fuzzy
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(Der Composer enth�lt einen nicht-Text Nachrichtenrumpf, der nicht "
@@ -10200,8 +10401,8 @@ msgstr "Betreff enth�lt"
 msgid "Subject does not contain"
 msgstr "Betreff enth�lt nicht"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10209,12 +10410,11 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits.\n"
 "�berschreiben?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Dieses Passwort speichern"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
 
@@ -10312,150 +10512,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "Jahr"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "Jahre"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "Sekunden"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "Monat"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "Minute"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "Monate"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "Stunde"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "Woche"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "Wochen"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "Stunde"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "Monat"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "Minute"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "Monate"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "Sekunden"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "Jahr"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "Jahre"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Sie haben vergessen, ein Datum zu w�hlen."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Sie haben ein ung�ltiges Datum gew�hlt."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Das Datum der Nachricht wird mit der Zeit\n"
-"verglichen, zu der der Filter ausgef�hrt oder\n"
-"der VOrdner ge�ffnet wird."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Das Datum der Nachricht wird mit der hier\n"
-"von Ihnen angegebenen Zeit verglichen."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Das Datum der Nachricht wird verglichen mit\n"
-"einer zur Zeit der Filterausf�hrung relativen\n"
-"Zeit, z.B. \"vor einer Woche\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "der aktuellen Zeit"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "einer von Ihnen angegebene Zeit"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "einer zur momentanen Zeit relativen Zeit"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "W�hlen Sie eine Vergleichszeit"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Vergleichen mit"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<hier klicken, um ein Datum zu w�hlen>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "jetzt"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " in der Vergangenheit"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "in der Vergangenheit"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %d. %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d. %b %H.%M"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " in der Vergangenheit"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<hier klicken, um ein Datum zu w�hlen>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "W�hlen Sie eine Vergleichszeit"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "_Dateiname angeben:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool '%s' existiert nicht oder ist keine regul�re Datei"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Eine Datei �ffnen"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Dann"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Aktion hinzuf�gen"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10464,12 +10614,12 @@ msgstr ""
 "Bitte gehen Sie zur�ck und w�hlen Sie einen g�ltigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Ordner w�hlen"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10478,92 +10628,164 @@ msgstr ""
 "Fehler im regul�ren Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Wichtig"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr "Arbeit"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr "Pers�nlich"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr "Sp�ter"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Der Filter muss benannt werden."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Regelname: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Aktionen ausf�hren"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Kriterium hinzuf�gen"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "Eingang"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "Ausgang"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Vergleichen mit"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "VOrdner bearbeiten"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Eingang"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Ausgang"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Das Datum der Nachricht wird mit der hier\n"
+"von Ihnen angegebenen Zeit verglichen."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Das Datum der Nachricht wird verglichen mit\n"
+"einer zur Zeit der Filterausf�hrung relativen\n"
+"Zeit, z.B. \"vor einer Woche\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Das Datum der Nachricht wird mit der hier\n"
+"von Ihnen angegebenen Zeit verglichen."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "einer zur momentanen Zeit relativen Zeit"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "in der Vergangenheit"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "nur bestimmte Ordner"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "der aktuellen Zeit"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "einer von Ihnen angegebene Zeit"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vOrdner-Quellen"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "mit allen aktiven Ordnern aus dem Netz"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "mit allen lokalen Ordnern und aktiven Ordnern aus dem Netz"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "mit allen lokalen Ordnern"
 
@@ -10590,41 +10812,42 @@ msgid "Beep"
 msgstr "Beep"
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
-msgstr "Befehl"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "enth�lt"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Gel�scht"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "enth�lt nicht"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "existiert nicht"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "existiert nicht"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "klingt nicht wie"
@@ -10646,87 +10869,83 @@ msgid "ends with"
 msgstr "endet mit"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Shell-Befehl ausf�hren"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existiert"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Wichtig"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "ist nach"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "ist vor"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "ist markiert"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "ist gr��er als"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ist nicht markiert"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr "Etikett"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailingliste"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Nachrichtenkopf"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Shell-Befehl ausf�hren"
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Gelesen"
 
@@ -10742,57 +10961,87 @@ msgstr "Regex-Treffer"
 msgid "Replied to"
 msgstr "Beantwortet an"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Gesch�ft"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "ist gr��er als"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "ist kleiner als"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Bewertung"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Status setzen:"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Shell-Befehl ausf�hren"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Gr��e (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Herkunfts-Account"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Status setzen:"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regeln"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Regel hinzuf�gen"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Regel bearbeiten"
 
@@ -10800,11 +11049,11 @@ msgstr "Regel bearbeiten"
 msgid "Score Rules"
 msgstr "Bewertungsregeln"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Sie m�ssen mindestens einen Ordner als Quelle angeben."
 
@@ -10812,31 +11061,31 @@ msgstr "Sie m�ssen mindestens einen Ordner als Quelle angeben."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importieren..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importieren von %s als %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird abgetastet"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Mail"
 
@@ -10902,37 +11151,37 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "M�ll"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 msgid "Scanning mail filters"
 msgstr "Mailfilter werden durchsucht"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Verzeichnis wird abgetastet"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Import beginnt"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 msgid "Mail Filters"
 msgstr "Mail-Filter"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11008,11 +11257,11 @@ msgstr "Fabrik f�r die Mailzusammenfassungs-Komponente."
 msgid "Font Preferences"
 msgstr "Schriftart-Vorlieben"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail Accounts"
 msgstr "Mail-Zug�nge"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Mail-Einstellungen"
 
@@ -11062,7 +11311,7 @@ msgstr "Eigenschaften..."
 msgid "Change this folder's properties"
 msgstr "Die Eigenschaften dieses Ordners �ndern"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11070,59 +11319,79 @@ msgstr ""
 "Einige Ihrer Mail-Einstellungen scheinen ung�ltig, bitte stellen Sie sicher, "
 "dass alles in Ordnung ist."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Sie haben keine Mailtransport-Methode eingestellt"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Warnung: Ge�nderte Nachricht"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Neue Mail-Nachricht"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Nachricht _verschicken"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Eine Nachricht erstellen"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Neue Nachricht"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Vorherige Nachricht"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Neue Mail-Nachricht"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutions Mail-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Evolutions Mail-Konfigurations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Evolutions Ordnerinformations-Komponente kann nicht initialisiert werden"
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr "Verbindung wird hergestellt..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschaften von \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Tempor�res Verzeichnis konnte nicht angelegt werden: %s"
@@ -11171,125 +11440,125 @@ msgstr "%d insgesamt"
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche erstellen..."
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VOrdner �ber _Betreff"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VOrdner �ber Abse_nder"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VOrdner �ber _Empf�nger"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner �ber Mailing_liste"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filter �ber _Betreff"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filter �ber _Absender"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filter �ber _Empf�nger"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filter �ber _Mailingliste"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Antwort an Ab_sender"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Liste antworten"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "Markierung _l�schen"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Als gelesen mar_kieren"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "L�sche_n r�ckg�ngig"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzuf�gen"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht erstellen"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "VOrdner �ber M_ailingliste"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter �ber _Mailingliste (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VOrdner �ber M_ailingliste (%s)"
@@ -11353,74 +11622,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle ben�tigten Felder ausgef�llt."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution-News-Editor"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution-Accounteditor"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Sie k�nnen keine zwei Zug�nge mit demselben Namen anlegen."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie diesen Account l�schen wollen?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nicht l�schen"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Account wirklich l�schen?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Sind Sie sicher, dass Sie diesen News-Account l�schen wollen?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Zugangsname"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -11429,30 +11689,30 @@ msgstr "Protokoll"
 msgid "Mail to %s"
 msgstr "Mail an %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzuf�gen"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr "Folgende Filterregel(n):\n"
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11463,7 +11723,7 @@ msgstr ""
 "    '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11475,7 +11735,7 @@ msgstr ""
 "empfangen oder erstellen k�nnen.\n"
 "M�chten Sie ihn jetzt konfigurieren?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11483,7 +11743,7 @@ msgstr ""
 "Sie m�ssen eine Identit�t einrichten,\n"
 "bevor Sie Mail erstellen k�nnen."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11492,7 +11752,7 @@ msgstr ""
 "bevor Sie Mail erstellen k�nnen."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11500,11 +11760,11 @@ msgstr ""
 "Sie verschicken eine HTML-formatierte Nachricht, aber die folgenden "
 "Empf�nger wollen keine HTML-formatierte Mail:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11512,7 +11772,7 @@ msgstr ""
 "Diese Nachricht hat keinen Betreff.\n"
 "Wirklich verschicken?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11521,11 +11781,11 @@ msgstr ""
 "der Liste zu verbergen, wird die Nachricht nur BCC-Empf�ngeradressen "
 "enthalten."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Diese Nachricht enth�lt ausschlie�lich BCC-Empf�nger."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11535,16 +11795,11 @@ msgstr ""
 "eine Apparently-To-Kopfzeile hinzuf�gt.\n"
 "Trotzdem verschicken?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie m�ssen Empf�nger angeben, um diese Nachricht zu verschicken."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Sie m�ssen einen Account einrichten, bevor Sie diese Mail verschicken k�nnen."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11552,28 +11807,28 @@ msgstr ""
 "Der Entw�rfe-Ordner f�r diesen Zugang konnte nicht ge�ffnet werden.\n"
 "M�chten Sie den vorgegebenen Entw�rfe-Ordner verwenden?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d um %H.%M schrieb %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sind Sie sicher, dass Sie alle %d Nachrichten bearbeiten wollen?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11581,7 +11836,7 @@ msgstr ""
 "Sie k�nnen nur im Entw�rfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11589,33 +11844,33 @@ msgstr ""
 "Sie k�nnen nur Nachrichten im\n"
 "Verschickt-Ordner neu verschicken."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle %d Nachrichten nochmals verschicken wollen?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Keine Nachricht ausgew�hlt"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Datei �berschreiben?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Nachricht speichern unter..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Nachrichten speichern unter..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Zum n�chsten Ordner mit ungelesenen Nachrichten gehen?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11623,7 +11878,7 @@ msgstr ""
 "Es gibt keine neuen Nachrichten mehr in diesem Ordner.\n"
 "Wollen Sie zum n�chsten Ordner gehen?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11636,7 +11891,7 @@ msgstr ""
 "\n"
 "Nachrichten wirklich entfernen?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11645,28 +11900,28 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11689,7 +11944,7 @@ msgstr "Beschreibung"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Namenlose"
 
@@ -11709,10 +11964,11 @@ msgid "Add Signature"
 msgstr "Signatur speichern"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die "
 "\"optionalen\" Felder unten m�ssen nicht\n"
@@ -11720,10 +11976,10 @@ msgstr ""
 "Sie verschicken, einschlie�en wollen."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Bitte geben Sie unten Informationen �ber Ihren Server f�r eingehende Mail "
 "an. Falls Sie nicht sicher sind,\n"
@@ -11734,10 +11990,10 @@ msgid "Please select among the following options"
 msgstr "Bitte w�hlen Sie aus den folgenden Optionen"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Bitte geben Sie unten Informationen �ber die Art ein, auf die Sie Mail "
 "verschicken werden. Falls Sie\n"
@@ -11745,14 +12001,13 @@ msgstr ""
 "Internetprovider."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Sie haben Ihre Mailkonfiguration fast abgeschlossen. Die Identit�t, der "
 "Server f�r eingehende und die\n"
@@ -11763,40 +12018,20 @@ msgstr ""
 "Dieser Name wird nur f�r die Bildschirmanzeige verwendet."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Zugangsdruide"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-msgid "Work"
-msgstr "Arbeit"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr "Pers�nlich"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr "Sp�ter"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Zugang %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Dienst wird �berpr�ft"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Verbindung zu Server..."
 
@@ -12039,224 +12274,213 @@ msgstr "Etikette und Farben"
 msgid "Loading Images"
 msgstr "Bilder laden"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Mailkonfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Nachrichten-Composer"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Nachrichtenanzeige"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP-Server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Mailbenachrichtigung"
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr "News-Server"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr "Bildschirmschriftarten"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Optionale Information"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schl�sselkennung:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Eine Farbe ausw�hlen"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschlie�lich _BCC-Empf�ngern nachfragen"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 msgid "Printed Fonts"
 msgstr "Druckschriftarten"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail-maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Umschrieben"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 msgid "Re_ply-To:"
 msgstr "A_ntwort an:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Erhalten von E-Mail"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 msgid "Receiving _Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Remember this _password"
 msgstr "Dieses Passwort s_peichern"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Ben�tigte Information"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Standard wiederh_erstellen"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr "Sich_erheit"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Sichere MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr "HTML Feste-Breite-Schriftart w�hlen"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "HTML Feste-Breite-Schriftart zum Drucken w�hlen"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr "HTML Variable-Breite-Schriftart w�hlen"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "HTML Variable-Breite-Schriftart zum Drucken w�hlen"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr "PGP-Programm w�hlen"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Ordner f�r verschickte _Nachrichten:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nachrichten in \"Verschickt\" und \"Entw�rfe\""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server ben�tigt _Legitimation"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Server-Konfiguration"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Tastenk�rzel-_Typ:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Signatur"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Signatur"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Quelle"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Quellinformation"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Sprachen f�r Rechtschreibpr�fung"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Rechtschreibpr�fung"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix-mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "Variable Breite:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12266,185 +12490,181 @@ msgstr ""
 "\n"
 "Klicken Sie \"Weiter\" zum Beginnen."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Bei Verwendung dieses Zugangs ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Legitimations-Typ: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch nach neuer Mail sehen"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr "Beep bei Eintreffen von neuer Mail"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "Kennung des _Zertifikats:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr "S�ubern eines Ordners _best�tigen"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_Test-Signatur:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bei Eintreffen neuer Mail nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktivieren"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr "_Feste Breite:"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Voller Name:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr "_HTML-Mail"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr "_Identit�t"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "Bilder _laden, falls Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "Dies zu meinem _Vorgabezugang machen"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Name:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Pfad zur _PGP-Bin�rdatei:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr "_Klangdatei bei Eintreffen neuer Mail abspielen"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr "_Erhalten von Mail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr "Vo_rgaben wiederherstellen"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sicherheit"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr "_Verschicken von Mail"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "_Animierte Bilder zeigen"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr "_Variable Breite:"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_alle"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newsfenster1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12468,219 +12688,230 @@ msgstr "S/MIME-Umschlagkontext konnte nicht angelegt werden."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME-Entschl�sselungskontext konnte nicht angelegt werden."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Tempor�re Datei '%s' konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Auf Platte speichern..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Anlage speichern"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "�ffnen in %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (�ber %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Bilder laden"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Laden des Nachrichteninhalts"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "_�berf�llige Aufgaben:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d. %b %H.%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Link in Browser �ffnen"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Linkziel kopieren"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Link speichern unter (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Bild speichern unter..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "MIME-Nachricht konnte nicht geparst werden. Wird als Quellcode angezeigt."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ung�ltige Adresse"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Von"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Antwort an"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "An"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "Mailer"
 
-#: mail/mail-format.c:1736
-msgid "View messages..."
-msgstr "Nachrichten anzeigen..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet. Klicken Sie f�r weitere "
 "Informationen auf das Schlosssymbol."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP-�berpr�fungskontext konnte nicht angelegt werden."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet und wurde als authentisch "
 "nachgewiesen."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Diese Nachricht ist digital unterzeichnet, aber konnte nicht als authentisch "
 "nachgewiesen werden."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) g�ltig auf Site \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf Daten im Netz (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Ung�ltiger external-body-Teil."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Ordner"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Ordner wird umkonfiguriert"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Metainformationen zum Ordner k�nnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr �ffnen k�nnen: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Metainformationen zum Ordner k�nnen nicht in %s gespeichert werden: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ordner-Metadaten %s k�nnen nicht gel�scht werden: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kann nicht umkonfiguriert werden, da er kein lokaler Ordner ist"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr "Datei %s konnte nicht geladen werden"
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Sie k�nnen das Format eines nichtlokalen Ordners nicht �ndern."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s neu konfigurieren"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12689,7 +12920,7 @@ msgstr ""
 "Fehler beim `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12698,7 +12929,7 @@ msgstr ""
 "Fehler beim Ausf�hren eines Vorgangs:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "In Arbeit"
 
@@ -12706,100 +12937,100 @@ msgstr "In Arbeit"
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Abrufen von Mail"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Trotzdem wurde die Nachricht erfolgreich verschickt."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Machrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s �ffnen"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Speichers %s wird ge�ffnet"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner '%s' wird gespeichert"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Ordner wird aktualisiert"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Ordner wird ges�ubert"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s abrufen"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d Nachricht(en) werden/wird abgerufen"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d Nachricht(en) werden/wird gespeichert"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12808,7 +13039,7 @@ msgstr ""
 "Ausgabedatei konnte nicht erstellt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12817,11 +13048,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Speichern der Anlage"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12830,27 +13061,22 @@ msgstr ""
 "Ausgabedatei kann nicht erstellt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird neu aufgebaut"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Shell-Befehl ausf�hren: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Suchen"
 
@@ -12905,32 +13131,41 @@ msgstr "Pfad: %s, Typ: %s"
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Mail erhalten und verschicken"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Alles abbrechen"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Aktualisieren..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Benutzer hat Aktion abgebrochen."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Dieses Passwort _behalten"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "F�r den Rest dieser Sitzung an dieses Passwort erinnern"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort f�r %s eingeben"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
@@ -12957,7 +13192,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Name:"
 
@@ -12987,7 +13222,7 @@ msgstr "Weitergeleitete Nachricht - %s"
 msgid "Forwarded message"
 msgstr "Weitergeleitete Nachricht"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Weitergeleitete Nachricht"
 
@@ -13001,7 +13236,7 @@ msgstr "VOrdner wird eingerichtet: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "VOrdner werden aktualisiert f�r URI: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13014,95 +13249,98 @@ msgstr ""
 "   '%s'\n"
 "Und wurden aktualisiert."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Es wurde versucht, einen vOrdner '%s' zu editieren, der nicht existiert."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Kein Betreff)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Nachricht"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "H�her"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Am h�chsten"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d. %b %H.%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Erzeugen der Nachrichtenliste"
 
@@ -13135,43 +13373,43 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Gr��e"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr "�berpr�fen"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Voller Name..."
@@ -13196,16 +13434,16 @@ msgstr "Ordner \"%s\" wird abonniert"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abonnement auf Ordner \"%s\" wird abbestellt"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Ordner"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gew�hlt"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Bitte w�hlen Sie einen Server."
 
@@ -17995,11 +18233,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24017,8 +24255,8 @@ msgstr "Beschreibung"
 msgid "Mail summary"
 msgstr "Mail-Zusammenfassung"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
@@ -24036,15 +24274,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com: Wort des Tages"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Zitate des Tages"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Einen Kanal hinzuf�gen"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geben Sie die Adresse des Kanals ein, den Sie hinzuf�gen wollen"
 
@@ -24056,26 +24294,26 @@ msgstr "Fehler beim Herunterladen des RDF"
 msgid "News Feed"
 msgstr "Nachrichtenkanal"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Hinzuf�gen"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Schneefall"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Keine Aufgaben"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(keine Beschreibung)"
 
@@ -25348,7 +25586,8 @@ msgid "Tasks "
 msgstr "Aufgaben "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Wetter-Einstellungen"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25406,7 +25645,7 @@ msgstr "Details anzeigen"
 msgid "Cancel Operation"
 msgstr "Aktion abbrechen"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25420,20 +25659,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Entw�rfe"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Eingang"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Verschickt"
 
@@ -25670,22 +25909,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Neuen Ordner anlegen"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Der Typ des ausgew�hlten Ordners ist f�r die \n"
-"gew�hlte Operation nicht g�ltig."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "_Neuen Ordner anlegen..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Neu..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Namenlos)"
 
@@ -25707,7 +25939,7 @@ msgstr ""
 "Sie k�nnen \"Automatisch\" w�hlen, wenn Sie ihn nicht wissen, und Evolution "
 "wird versuchen, ihn selber zu bestimmen."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Bitte w�hlen Sie die Informationen, die Sie importieren wollen:"
 
@@ -25738,22 +25970,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Sie k�nnen nur in lokale Ordner importieren"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25763,11 +25991,11 @@ msgstr ""
 "%s\n"
 "umgehen kann"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importieren"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25776,17 +26004,17 @@ msgstr ""
 "Importieren von %s.\n"
 "Starten von %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Fehler beim Starten von %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Fehler beim Laden von %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25795,31 +26023,31 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Eine Datei w�hlen"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Dateityp:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Daten und Einstellungen aus �lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Eine einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25827,24 +26055,24 @@ msgstr ""
 "Bitte warten...\n"
 "Suche nach existierenden Einstellungen"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Ordner w�hlen"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Geben Sie einen Zielordner f�r das Importieren dieser Daten an"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importieren"
 
@@ -25892,9 +26120,14 @@ msgstr "Ordner %s �ffnen"
 msgid "in \"%s\" ..."
 msgstr "�ffnen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Ordner konnte nicht umbenannt werden: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Der angegebene Ordner kann nicht erstellt werden:\n"
 "%s"
@@ -25912,8 +26145,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Das Evolution-Mailerdruiden-Interface konnte nicht gestartet werden\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Neu"
@@ -25954,58 +26187,59 @@ msgstr "Gehe zu Ordner..."
 msgid "Select the folder that you want to open"
 msgstr "W�hlen Sie den Ordner, den Sie �ffnen wollen"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Eine neue Verkn�pfung anlegen"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "W�hlen Sie den Ordner, auf den die Verkn�pfung zeigen soll:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Offline _arbeiten"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(keine)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist zur Zeit online. Klicken Sie diesen Knopf, um offline "
 "zu arbeiten."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ist gerade offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26017,12 +26251,12 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Lokaler Speicher kann nicht eingestellt werden -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26033,31 +26267,31 @@ msgstr ""
 "unerwartet ab. Sie m�ssen Evolution beenden und neu starten, um\n"
 "wieder auf diese Daten zugreifen zu k�nnen."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Ung�ltige Argumente"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF kann nicht stattfinden"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Neue Verkn�pfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26066,108 +26300,118 @@ msgstr ""
 "Wollen Sie wirklich Gruppe `%s' aus\n"
 "der Verkn�pfungsleiste entfernen?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nicht entfernen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Kleine Icons"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Die Verkn�pfungen als kleine Icons anzeigen"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Gro�e Icons"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Die Verkn�pfungen als gro�e Icons zeigen"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "Neue Gruppe..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Eine neue Verkn�pfungsgruppe anlegen"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Diese Gruppe _entfernen..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe entfernen"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Diese Gruppe _umbenennen..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Diese Verkn�pfungsgruppe umbenennen"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Die Verkn�pfungsleiste verbergen"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Eine neue Verkn�pfung anlegen"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Eine neue Verkn�pfung anlegen"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Ausgew�hlte Verkn�pfungsgruppe umbenennen in:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Den mit dieser Verkn�pfung verbundenen Ordner �ffnen"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "In neuem _Fenster �ffnen"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Diese Verkn�pfung umbenennen"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Entfernen"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Diese Verkn�pfung aus der Verkn�pfungsleiste entfernen"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von Verkn�pfungen."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Verkn�pfungen"
 
@@ -26176,55 +26420,55 @@ msgstr "Verkn�pfungen"
 msgid "Checkbox"
 msgstr "Vorsitzender"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ung�ltig"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Nicht gen�gend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Der Ordner ist nicht leer"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funktion f�r diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operation nicht unterst�tzt"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird f�r diese Speicherweise nicht unterst�tzt"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Der angegebene Ordner kann nicht ge�ndert oder entfernt werden"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ein Ordner kann nicht das Kinder eines seiner Nachkommen werden"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Ein Ordnersperre mit diesem Namen kann nicht erzeugt werden"
 
@@ -26279,63 +26523,63 @@ msgstr ""
 "Der Fehler vom Aktivierungssystem ist:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA-Fehler"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Unterbrochen"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ung�ltiges Argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Hat bereits einen Besitzer"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Kein Besitzer"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nicht unterst�tzter Typ"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nicht unterst�tztes Schema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nicht unterst�tzte Aktion"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existiert"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ung�ltiger URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Hat Unterordner"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Keine Platz mehr frei"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Alter Besitzer ist gestorben"
 
@@ -26361,6 +26605,26 @@ msgstr "Rechner"
 msgid "The following connections are currently active:"
 msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakte: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Mail"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Aufgaben"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ordnername:"
@@ -26373,6 +26637,34 @@ msgstr "Ordnertyp:"
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner erstellt werden soll:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "_Neuen Ordner anlegen..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Ordnername:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Servername:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Benutzername:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Setupdruide"
@@ -26471,15 +26763,15 @@ msgstr "Mich nicht mehr fragen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution wird beendet..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26499,53 +26791,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Mich nicht mehr fragen"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Auf die Ximian-Evolution-Shell kann nicht zugegriffen werden."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Die Ximian-Evolution-Shell kann nicht initialisiert werden: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Splashscreen deaktivieren"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Import beginnt"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Das Bonobo-Komponentensystem kann nicht initialisiert werden."
 
@@ -26582,116 +26874,110 @@ msgstr "Die Auswahl kopieren"
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Einen neuen Kontakt anlegen"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Neuen Kontaktliste anlegen"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Ausgew�hlte Kontakte l�schen"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Ausgew�hlte Nachrichten in einen anderen Ordner kopieren"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einf�gen"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Kontakte"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Druckvorschau"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Ausgew�hlte Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Ausgew�hlte Kontakte als VCard speichern"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Alle Kontakte ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Eine Nachricht an die ausgew�hlten Kontakte schicken."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Ausgew�hlte Kontakte an jemand anderen schicken."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "der aktuellen Zeit"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "Aktio_nen"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktliste"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Kontakt weiterleiten..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Als VCard _speichern"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Nach Kontakten _suchen"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Alle ausw�hlen"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "_Nachricht an Kontakt schicken..."
@@ -26736,11 +27022,6 @@ msgstr "Monat"
 msgid "Previews the calendar to be printed"
 msgstr "Zeigt eine Vorschau des zu druckenden Kalenders"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Druckvorschau"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
@@ -26773,7 +27054,7 @@ msgstr "Woche"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Schlie�en"
 
@@ -26786,7 +27067,7 @@ msgid "Delete this item"
 msgstr "Diesen Eintrag l�schen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
@@ -26798,8 +27079,8 @@ msgstr "Eine Vorschau des zu druckenden Objektes zeigen"
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Speichern"
 
@@ -26824,9 +27105,9 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Datei"
 
@@ -26836,7 +27117,7 @@ msgstr "Umschlag drucken..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
@@ -26850,8 +27131,8 @@ msgstr "_Nachricht an Kontakt schicken..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Speichern"
 
@@ -26949,26 +27230,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Alle gel�schten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Neue Nachricht"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Nachricht wird in Ordner gespeichert"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Nachrichten-Vorschaufenster zeigen"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf entfernten Servern abonnieren oder abbestellen"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor f�r virtuelle Ordner..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Vorschaufl�che"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Ordner _abonnieren..."
 
@@ -27068,7 +27359,7 @@ msgstr "Nachrichtenliste in Threads geordnet"
 msgid "_Expunge"
 msgstr "_S�ubern"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Ordner"
 
@@ -27330,181 +27621,196 @@ msgstr "Letzte ungelesene Nachricht"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Aufgaben-Antwort"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Es kann nicht in virtuelle Ordner kopiert oder verschoben werden"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Letzte wichtige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau der zu druckenden Nachricht zeigen"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Zur�ck"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die ausgew�hlte Nachricht an jemanden weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgr��e zur�cksetzen"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Nachricht durch_suchen..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Die Nachricht als Textdatei speichern"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach einem Text suchen"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Die Seiteneinstellungen f�r Ihren aktuellen Drucker einrichten"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "E-Mail-_Quellcode zeigen"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Alle _Kopfzeilen anzeigen"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Nachricht im normalen Stil zeigen"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Nachricht mit allen E-Mail-Kopfzeilen zeigen"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Den rohen E-Mail-Quellcode dieser Nachricht anzeigen"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Text_gr��e"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "L�schen f�r ausgew�hlte Nachrichten r�ckg�ngig machen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VOrdner �ber Mailing_liste..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VOrdner �ber _Absender..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VOrdner �ber _Empf�nger..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VOrdner �ber _Betreff..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Beilegen"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Filter aus Nachricht _erzeugen"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Nachricht _weiterleiten"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "An Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Gr��er"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "N�chste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normale Anzeige"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Nachricht _�ffnen"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Umschrieben"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Umbenennen..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "Werkzeuge"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "L�schen r�ckg�ngig"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Dieses Fenster schlie�en"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "Schlie�en"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Ansicht"
 
@@ -27533,169 +27839,161 @@ msgstr ""
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "_HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Text_datei an Ort und Stelle einf�gen..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Eine Datei als Text in die Nachricht einf�gen"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Textdatei einf�gen..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "�ffnen"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Eine Datei �ffnen"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Mit PGP verschl�sseln"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Mit PGP signieren"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Mit S/MIME verschl�sseln"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Mit S/MIME signieren"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Entwurf speichern"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Die aktuelle Datei unter anderem Namen speichern"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Die Nachricht in einem bestimmten Ordner speichern"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Verschicken"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "_Sp�ter verschicken"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "_Sp�ter verschicken"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Die Mail im HTML-Format verschicken"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Die Nachricht sp�ter verschicken"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Diese Nachricht jetzt verschicken"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Anlagen anzeigen / verbergen"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Anzeige des BCC-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Anzeige des CC-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Anzeige des From-W�hlers an/aus"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Anzeige des Antwort-an-Feldes an/aus"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Anlage..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_BCC-Feld"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_CC-Feld"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "Alle _l�schen"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Von-Feld"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Einf�gen"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_�ffnen..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Antwort-an-Feld"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "_HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Den Eintrag speichern und das Dialogfenster schlie�en"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hilfe"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Signatur"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzuf�gen"
@@ -27793,171 +28091,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Zu _Verkn�pfungsleiste hinzuf�gen"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners �ndern"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Diesen Ordner kopieren"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "_Neuen Ordner anlegen..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Eine Verkn�pfung mit diesem Ordner in der Verkn�pfungsleiste anlegen"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Einen neuen Ordner anlegen"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Eine neue Verkn�pfung anlegen"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Einen neuen Ordner anlegen"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Diesen Ordner l�schen"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution-_Fenster"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Diesen Ordner an einen anderen Ort verschieben"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "_Neuen Ordner anlegen..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "In neuem Fenster �ffnen"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Diesen Ordner in einem anderen Fenster �ffnen"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Pilot-Einstellungen..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Verschicken / Empfangen"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Mail in der Warteschlange verschicken und neue Mail abholen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Mailkonfiguration"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Informationen �ber Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Ein/Aus"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der Verkn�pfungsleiste an/aus"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Den gew�hlten Ordner betrachten"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian-Evolution-_FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "�ber Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopieren..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Ordnerleiste"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Ordner"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Verschieben..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Neuer Ordner"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot-Einstellungen..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Schriftart-Vorlieben"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Verschicken / Empfangen"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Verkn�pfung"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Verkn�pfungsleiste"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Verkn�pfung"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "�bersicht drucken"
@@ -27971,17 +28300,40 @@ msgid "Reload the view"
 msgstr "Die Ansicht neu laden"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adresskarten"
+#, fuzzy
+msgid "By _Company"
+msgstr "Nach Firma"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Nach Firma"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adresskarten"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonliste"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Wochenansicht"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Tagesansicht"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Monatsansicht"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Werkwochenansicht"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28007,13 +28359,19 @@ msgstr "Nach Betreff"
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Mit Kategorie"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Aufgabe"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28167,11 +28525,11 @@ msgstr "Zeichenkodierung"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor f�r Suchen"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Suche speichren"
 
@@ -28211,21 +28569,21 @@ msgstr "Meldung"
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Jetzt suchen"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "L�schen"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "L�schen"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Jetzt suchen"
 
@@ -28239,18 +28597,172 @@ msgstr "Der pers�nliche Adressbuchserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Der pers�nliche Kalenderserver; Kalender-Fabrik"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME VFS konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init-corba(): GNOME konnte nicht initialisiert werden"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution kann nicht auf den lokalen Adressbuchspeicher\n"
+#~ "zugreifen. Dies k�nnte durch den Absturz der Komponente\n"
+#~ "evolution-addressbook verursacht worden sein. Um uns zu helfen,\n"
+#~ "dieses Problem besser zu verstehen und irgendwann zu l�sen,\n"
+#~ "schicken Sie bitte eine E-Mail mit einer detaillierten\n"
+#~ "Beschreibung der Umst�nde, unter denen dieser Fehler auftrat,\n"
+#~ "an Jon Trowbridge <trow@ximian.com>. Danke."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution kann nicht auf den lokalen Adressbuchspeicher\n"
+#~ "zugreifen. Unter normalen Umst�nden sollte dies nicht\n"
+#~ "passieren. Sie werden Evolution beenden und neustarten\n"
+#~ "m�ssen, um das Problem zu beheben."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Durchsuchen..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Der Status der Besprechung hat sich ge�ndert. Aktualisierte Version "
+#~ "verschicken?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Diesen Termin _l�schen"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Ausgabestelle: %s\n"
+#~ "Betreff: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL-Protokollfehler"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "E-/A-Fehler: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Willkommen-Antwortfehler: %s: vielleicht nicht fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Zeit�berschreitung bei HELO-Anfrage: %s: nicht fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO-Antwortfehler: %s: nicht fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Zeit�berschreitung bei QUIT-Anfrage: %s: nicht fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Datei einf�gen"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Sie haben ein ung�ltiges Datum gew�hlt."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Das Datum der Nachricht wird mit der Zeit\n"
+#~ "verglichen, zu der der Filter ausgef�hrt oder\n"
+#~ "der VOrdner ge�ffnet wird."
+
+#~ msgid "Command"
+#~ msgstr "Befehl"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution-News-Editor"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Sind Sie sicher, dass Sie diesen News-Account l�schen wollen?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Sie m�ssen einen Account einrichten, bevor Sie diese Mail verschicken "
+#~ "k�nnen."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP-Server:"
+
+#~ msgid "News Servers"
+#~ msgstr "News-Server"
+
+#~ msgid "Source"
+#~ msgstr "Quelle"
+
+#~ msgid "Source Information"
+#~ msgstr "Quellinformation"
+
+#~ msgid "newswindow1"
+#~ msgstr "newsfenster1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Auf Platte speichern..."
+
+#~ msgid "View messages..."
+#~ msgstr "Nachrichten anzeigen..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Shell-Befehl ausf�hren: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Neuen Ordner anlegen"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Der Typ des ausgew�hlten Ordners ist f�r die \n"
+#~ "gew�hlte Operation nicht g�ltig."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Sie k�nnen nur in lokale Ordner importieren"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktliste"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Text_datei an Ort und Stelle einf�gen..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Eine Datei als Text in die Nachricht einf�gen"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Textdatei einf�gen..."
+
+#~ msgid "Send _Later"
+#~ msgstr "_Sp�ter verschicken"
+
+#~ msgid "Send _later"
+#~ msgstr "_Sp�ter verschicken"
+
+#~ msgid "Send the message later"
+#~ msgstr "Die Nachricht sp�ter verschicken"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot-Einstellungen..."
+
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adressbuch-Einstellungen"
 
@@ -28445,9 +28957,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Same as text"
 #~ msgstr "Wie Text"
 
-#~ msgid "Select a signature file"
-#~ msgstr "Signaturdatei w�hlen"
-
 #~ msgid "Select a signature script"
 #~ msgstr "Signaturdatei-Skript w�hlen"
 
@@ -28656,9 +29165,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Dieses Passwort _behalten"
-
 #, fuzzy
 #~ msgid "_Reply-To:"
 #~ msgstr "Antwort an:"
@@ -28817,9 +29323,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Mailspeicher-Ordner (intern)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Verbindung zum Speicher konnte nicht hergestellt werden: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "vOrdner aus Suche erzeugen"
 
@@ -28924,16 +29427,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Einen _neuen Termin anlegen"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Einen neuen Termin anlegen"
-
-#, fuzzy
-#~ msgid "Create a new meeting request"
-#~ msgstr "Eine neue Aufgabe anlegen"
-
-#~ msgid "Create a new task"
-#~ msgstr "Eine neue Aufgabe anlegen"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Ein ganzt�giges Ereignis anlegen"
 
@@ -29261,9 +29754,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ "Dies verbindet mit dem POP-Server und benutzt Kerberos 4, um sich zu "
 #~ "legitimieren."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Legitimation beim KPOP-Server konnte nicht erfolgen: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Verbindung zu Server konnte nicht hergestellt werden: %s"
 
@@ -29333,9 +29823,6 @@ msgstr "init_bonobo(): Bonobo konnte nicht initialisiert werden"
 #~ msgid "New List"
 #~ msgstr "Neue Liste"
 
-#~ msgid "New Message"
-#~ msgstr "Neue Nachricht"
-
 #~ msgid "Forward As"
 #~ msgstr "Weiterleiten als"
 
diff --git a/po/el.po b/po/el.po
index 2ef2047c8e..a17bd21119 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.1.99\n"
-"POT-Creation-Date: 2002-07-23 11:16+0100\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-01-16 19:40GMT\n"
 "Last-Translator: Nick Niktaris(����� ��������) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -356,7 +356,7 @@ msgid "Could not initialize Bonobo"
 msgstr "��� ���� ������ � ������������ ��� Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "������� ���������..."
 
@@ -369,32 +369,32 @@ msgstr "������� �������..."
 msgid "Error in search expression."
 msgstr "������ ���� ������� ����������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "�������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "�������� ������ ��� ��� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "����������� ������ ���� ���������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "������������ ����������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "���� ������������� ���������� ��� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "������ ��������� ������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "��� ���� ������ � ��������� ���������: %s"
@@ -490,11 +490,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1073
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "������"
 
@@ -510,34 +510,33 @@ msgstr "����������� LDAP"
 msgid "LDAP server containing contact information"
 msgstr "����������� LDAP ��� �������� ����������� ������"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "��� �����"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_�����"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "���������� ���� ������"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "��� ����� ������"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_����� ������"
 
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:569
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "���������� ���� ������ ������"
 
-#: addressbook/gui/component/addressbook-component.c:584
-msgid "New Contact"
-msgstr "��� �����"
-
-#: addressbook/gui/component/addressbook-component.c:584
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_�����"
-
-#: addressbook/gui/component/addressbook-component.c:585
-#, fuzzy
-msgid "Create a new contact"
-msgstr "���������� ���� ������"
-
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -590,11 +589,11 @@ msgstr "��� ���� ������ � ������������ ��� gnome-vfs"
 msgid "Other Contacts"
 msgstr "������ ������"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "��� ���� ������ �� ������� ��� ������� �����������"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -604,7 +603,7 @@ msgstr ""
 "�������� ��� ����� ��������� ����� URI, � ��� � ������������ LDAP �����\n"
 "����� �����������"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -616,7 +615,7 @@ msgstr ""
 "��������� �� ��������� ��� ��� ����� CVS ���� ������\n"
 "���� ��� OpenLDAP ��� ��� �������� ��������.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -624,44 +623,44 @@ msgstr ""
 "��� ���� ������ �� ������� ��� ������� �����������.  �������� ������� ��\n"
 "� �������� ������� ��� ��� ����� �� �������� ��������� �� ����."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "���������� ������ ��������� ��� %s (������� %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "�������� ��"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "� ��������� �����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "���� ����� ��������"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "��� �������������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���� ���������"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "�� URI ��� �� ��������� � ��������� �������"
 
@@ -783,7 +782,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "����� ������� �����������"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -881,7 +880,7 @@ msgstr "���������"
 msgid "Mappings"
 msgstr "���������"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
 #: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
@@ -936,7 +935,7 @@ msgstr "��������� �� _�����:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1972 calendar/gui/e-day-view.c:1703
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
 #: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "������� ���������"
@@ -1127,15 +1126,15 @@ msgid "Using email address"
 msgstr "_���� ����� � ��������� ������������"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:136 shell/glade/e-folder-list.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_��������"
 
@@ -1181,8 +1180,8 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:151 ui/evolution-addressbook.xml.h:37
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1302,9 +1301,9 @@ msgstr "���������� ��� �� ���������� �������� �������� ��� ������� �����������"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:692
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:462
-#: filter/filter-rule.c:677 my-evolution/e-summary-shown.c:552
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "��������"
@@ -1334,11 +1333,11 @@ msgstr "(%d ��� �����������)"
 msgid "Unnamed Contact"
 msgstr "����� ����� �����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:510
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "�������� ������ ��� �� ������ �����������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:547
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "���������� ��������"
@@ -1482,11 +1481,11 @@ msgstr "�������� ��� �������� ��������� _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3626
-#: calendar/gui/e-week-view.c:3510 filter/filter.glade.h:8
-#: mail/folder-browser.c:1716 mail/mail-config.glade.h:149
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "��_������"
@@ -2808,7 +2807,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_�������� ����������� ���� ��� �������� �� ���� �� �����"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "�_�������"
 
@@ -2871,7 +2870,7 @@ msgstr ""
 "��� �� ����� ��� ������.  ������ ���������� �� ���������;"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "����������� ���������"
 
@@ -2899,13 +2898,13 @@ msgid "Error getting book view"
 msgstr "������ ���� ��� �������� ��� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ������������ ������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "��������"
 
@@ -2913,7 +2912,7 @@ msgstr "��������"
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
 #: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1123
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "������� ������"
 
@@ -2922,7 +2921,7 @@ msgid "Repository offline"
 msgstr "������ ������� ����� �������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "��� ����������� � ��������"
 
@@ -2939,7 +2938,7 @@ msgid "Protocol not supported"
 msgstr "��� ������������� �� ����������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2962,48 +2961,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "�� ������ %s ��� �������"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ �� ������������ ��� �������;"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "������ ������������ ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "������ ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "�������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3011,22 +3015,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "����� �����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "����� �����"
@@ -3099,7 +3103,7 @@ msgstr "������ �����������"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "���������� �� (VCard)"
 
@@ -3139,7 +3143,7 @@ msgid "Pilot Settings..."
 msgstr "��������� ���������� _�������..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�������� ������"
 
@@ -3148,8 +3152,8 @@ msgid "Send Message to Contact"
 msgstr "�������� ��������� ��� �����"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "��������"
@@ -3169,7 +3173,7 @@ msgid "Move to folder..."
 msgstr "_���������� ��� ������..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�������"
 
@@ -3180,20 +3184,20 @@ msgid "Copy"
 msgstr "���������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "����������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "��������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_�������� �������"
@@ -3452,26 +3456,26 @@ msgstr "�������� ����� �����"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:734
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "�����"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1699
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:733
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "��������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "�������"
@@ -3597,11 +3601,11 @@ msgstr "������ ��� ������� ��������� (�����)"
 msgid "_Edit appointment"
 msgstr "����������� _��������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:674
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "��� ������� ��������� ���������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:734
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3613,13 +3617,13 @@ msgstr ""
 "�������� e-mail �� Evolution �� ��������� ��� ��������\n"
 "�������� �� ��� �������� ����������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:752
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2611
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�������������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:757
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3636,7 +3640,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ������������;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� ��� ��������� � �������."
@@ -3665,7 +3669,7 @@ msgstr "� ��������� ��������"
 msgid "Comment contains"
 msgstr "�� ������ ��������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1090
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "����������"
 
@@ -3676,7 +3680,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1429 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d %a %b"
 
@@ -3698,19 +3702,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "��� ���� ������ �� ������������ ������� �����������. �������� ������� ��� "
 "����������� ��� ORBit and OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:976
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:978
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "������������"
@@ -3735,37 +3739,37 @@ msgstr "�"
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "���������"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "��� ���� ���������"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�� �������"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "������������"
 
-#: calendar/gui/calendar-model.c:1040
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3776,34 +3780,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1900
-#: mail/folder-browser.c:1678 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:453
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
 #: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "�������"
 
-#: calendar/gui/calendar-model.c:1709 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1709 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "���"
 
@@ -3825,7 +3828,7 @@ msgstr "������� ����"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1065
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "����������"
 
@@ -3833,12 +3836,12 @@ msgstr "����������"
 msgid "Folder containing appointments and events"
 msgstr "������� ��� �������� �������� ��� ��������"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1069
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "��������"
 
@@ -3846,63 +3849,63 @@ msgstr "��������"
 msgid "Folder containing to-do items"
 msgstr "������� ��� �������� �������� ����-���������"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "��� ��������"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "��������"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "���������� ���� ��������"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "��������� ����������� ��������"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "��� �������"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_�������"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "���������� ���� ��������"
 
-#: calendar/gui/component-factory.c:721
-#, fuzzy
-msgid "New appointment"
-msgstr "��� ��������"
-
-#: calendar/gui/component-factory.c:721
-#, fuzzy
-msgid "_Appointment"
-msgstr "��������"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "���������� ���� ��������"
-
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
@@ -3970,7 +3973,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "�� ����� ��� �����������:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "������"
 
@@ -3978,11 +3982,13 @@ msgstr "������"
 msgid "extra times every"
 msgstr "�������� ����� ����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "�����"
 
@@ -4110,7 +4116,7 @@ msgstr "������������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "��������:"
 
@@ -4139,7 +4145,7 @@ msgstr "����� ��� ��������"
 msgid "hour(s)"
 msgstr "���(��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "�����(�)"
 
@@ -4317,7 +4323,7 @@ msgid "_Fri"
 msgstr "_���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_������"
 
@@ -4503,20 +4509,20 @@ msgstr "������������ ���������� - %s"
 msgid "No summary"
 msgstr "����� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1204
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3839
-#: calendar/gui/e-week-view.c:3742 composer/e-msg-composer.c:1049
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1305
-#: calendar/gui/dialogs/comp-editor.c:1329
-#: calendar/gui/dialogs/comp-editor.c:1353
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "��� ���� ������ �� ��������� � �������� ������!"
 
@@ -4719,7 +4725,7 @@ msgid "Member"
 msgstr "�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4731,7 +4737,7 @@ msgstr "�����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
@@ -4818,7 +4824,7 @@ msgstr "���"
 msgid "first"
 msgstr "�����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:87
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "������������"
 
@@ -4842,7 +4848,7 @@ msgstr "�����"
 msgid "Other Date"
 msgstr "���� ���"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "�����"
 
@@ -4946,20 +4952,26 @@ msgstr "% ������������"
 msgid "Date Completed:"
 msgstr "������������ ���:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "������� ��������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_�������������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_���������:"
 
@@ -4973,7 +4985,7 @@ msgstr "������"
 msgid "Assignment"
 msgstr "�������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4988,124 +5000,134 @@ msgid "_Due Date:"
 msgstr "���������� _�����:"
 
 #: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:450
-#, fuzzy
+#, fuzzy, c-format
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2752
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
 #: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3608
-#: calendar/gui/e-week-view.c:3492 mail/folder-browser.c:1689
-#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "���������� ��..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3610
-#: calendar/gui/e-week-view.c:3466 calendar/gui/e-week-view.c:3494
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_��������..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3615
-#: calendar/gui/e-week-view.c:3499 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_�������"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3616
-#: calendar/gui/e-week-view.c:3500 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "���������"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3579
-#: calendar/gui/e-day-view.c:3617 calendar/gui/e-week-view.c:3470
-#: calendar/gui/e-week-view.c:3501 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "����������"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "������� ��������"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�������� �� i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_�������� �� ������������"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_�������� �������� �� �������������"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_�������� ����������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7467
-#: calendar/gui/e-week-view.c:4231
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "���������� ������������"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���� ��� ��� �������� ��������"
@@ -5114,8 +5136,8 @@ msgstr "���� ��� ��� �������� ��������"
 msgid "Alarms"
 msgstr "������������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "������������"
 
@@ -5145,7 +5167,7 @@ msgstr "���������� �������"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:51 shell/e-shell.c:740
-#: shell/e-shortcuts.c:1057
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "��������"
 
@@ -5187,111 +5209,111 @@ 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:284 calendar/gui/e-day-view.c:1415
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1442
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:639 calendar/gui/e-week-view.c:376
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "��"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:642 calendar/gui/e-week-view.c:379
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "��"
 
-#: calendar/gui/e-day-view.c:3563
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "��� �_��������"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "��� _������� ��������� ��� ������"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "���������"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "��� �������"
 
-#: calendar/gui/e-day-view.c:3574 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "��������..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3476
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "������� ��� _������"
 
-#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3477
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_������� ���� ����������..."
 
-#: calendar/gui/e-day-view.c:3593 calendar/gui/e-week-view.c:3481
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "����_������ ����������� ��������������"
 
-#: calendar/gui/e-day-view.c:3598 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "���������� ���� � /%s"
 
-#: calendar/gui/e-day-view.c:3600 calendar/gui/e-week-view.c:3486
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "���������� ���� � /%s"
 
-#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3493
-#: mail/folder-browser.c:1691 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�_��������� ��..."
 
-#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3505
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "��������������� _����������"
 
-#: calendar/gui/e-day-view.c:3622 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�������� �� i_Calendar"
 
-#: calendar/gui/e-day-view.c:3627 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "�� ����� ���� � �������� _������������"
 
-#: calendar/gui/e-day-view.c:3628 calendar/gui/e-week-view.c:3512
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "�������� ����� ��� _���������"
 
-#: calendar/gui/e-day-view.c:3629 calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "�������� �_��� ��� ����������"
 
-#: calendar/gui/e-day-view.c:3991 calendar/gui/e-week-view.c:3870
-#: shell/e-shell-view-menu.c:641
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "�� �������� GNOME Pilot �������� �� ��� ����� ������������� �' ���� �� "
 "�������."
 
-#: calendar/gui/e-day-view.c:3997 calendar/gui/e-week-view.c:3876
-#: shell/e-shell-view-menu.c:649
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ���� ��� �������� ���%s."
@@ -5332,7 +5354,7 @@ msgstr "� ������� ������������: <b>"
 msgid "Task Due: <b>"
 msgstr "���� ��������: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "����������� iCalendar"
 
@@ -5341,12 +5363,12 @@ msgstr "����������� iCalendar"
 msgid "iCalendar Error"
 msgstr "������ iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "��� ������� �����"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5354,330 +5376,337 @@ msgstr ""
 "<br> �������� �������� ��� �������� �����������, ��� �������� ���� ��� "
 "�������� ��� �� �������� �����."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>������</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"���������� ����: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_���������:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "������ ���������"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "�������� ��� ��������:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
 #: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "����������� �������"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "�������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "�������� ���������� ���������"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "�������� ���������� �����������"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ���� ����������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "����������� ����������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> ��������� ��� �������� ��� �� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� ���������."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �� ����� �� ��������� ��� ���������� ����������� ����������."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "����_�� ��������� ����������"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ���� ��������� �� ��� ��������� �� ���������."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�������� ����������"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ������� ��� ���������."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "������� ����������"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "�/� <b>%s</b> ������� ��� ���������� ������."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "��������� ������ ����������"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ���� ����������� ����������� ��������."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "����������� ��������"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ��� ���� ������� �� ���������� ��� �������"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �� ����� �� ��������� �� ��� ��������� �������."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �� ����� ��� ��������� ���������� ��������."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "������ _�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �������� �� ��� ������� ��������"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ���� �������� ��� �������."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr " ������ ��������"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ���� ���������� ����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "����������� ��������������"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "�/� <b>%s</b> ���� ����������� ��������������."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�/� <b>%s</b> �������� ���� ������ ��������������."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "��������� ������ ��������������"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "� ������� �������� �� ���� ������������ �����."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "�� ������ �������� ���� �������� ��� ��� ��������������"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "�� �������������� ������ ��� �������� ������ ������ �����������"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "�� �������������� ������ �������� �������� ��� ��� ������� �� ����������"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "� �������� ������������\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "��� ���� ������ �� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "��� ���� ������ � �������� ��� ���������� ��������������� ������ �� �������� "
 "��� ������� �����"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "��� ���� ������ � ��������� ��� ���������� ��������������� ���� ���� �� "
 "������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "� ��������� ��������������� ����������\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "��� ���� ������ � �������� ��� ���������� ���������������\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "� �������� ������������"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "�� �������� ��������!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "��� ���� ������ � �������� ��� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "������� �������"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "������� �������"
@@ -5723,7 +5752,7 @@ msgstr "���������� �������"
 msgid "Chair Persons"
 msgstr "����� ����������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "����������� �������������"
 
@@ -5736,57 +5765,52 @@ msgid "Non-Participants"
 msgstr "��-�������������"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "�����"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "�������"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "���������"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "����������� ����������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "������������ ����������"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "��-����������"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "������� ��������"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�����������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "���������������"
 
@@ -5876,42 +5900,43 @@ msgstr "������ �_������ ����������:"
 msgid "Meeting _end time:"
 msgstr "������ _��������� ����������:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "������� ��������� ��� %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "������� � ������� ��������� ��� `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "������� �� ������� ������� ��� `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���������� �����������"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�������� ����������� ������������"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "����������� � �������"
 
-#: calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "��� �_�������..."
 
@@ -5925,11 +5950,16 @@ msgstr "������� �� ������� ������� ��� `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "� ������� ��� ���������� ��� ��� ������� ��� '%s' ��� �������������"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "������� ����������� ��� %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "������� ������� %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "��������"
@@ -5986,49 +6016,49 @@ msgstr "���������"
 msgid "September"
 msgstr "�����������"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "���������� ����������� ���� ���������������"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "������ �� ������� ���� ����������."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "����������� ���������"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "����������� ��������"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "���������� ��������������"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "����������� �����������"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "������ �� ����� ��������������� ��� ���� �� �������."
 
@@ -6265,7 +6295,7 @@ msgid "Print Calendar"
 msgstr "�������� �����������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2899
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "������������� ���������"
@@ -6302,8 +6332,8 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2383
-#: mail/mail-callbacks.c:2625
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "�� ��� ��������� � �������."
 
@@ -6405,110 +6435,110 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "����������"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "� ������ ��������� ���� 0 �����������"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "����������� ������� ��� ������ ��� ��� ���������"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "����������� ������� ��� ������ �� ����� � ���������� 1 ��������"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "����������� � ���������� ������ 1 �� ����� �������� ����������/������ ISO "
 "8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "� �������� ������ ������ ���������� �� ���� 2 �����������"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 "� �������� ������ ������ ���������� �� ���� �� ��������� 2 ���� �������"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "� ���� ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "�� ������ ������ ������ ���������� �� ���� 1 ���������"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "�� get-vtype ���������� �� ���� 0 �����������"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "� �������� ��� �������� ���������� ��� ������� ���� boolean"
 
@@ -8109,52 +8139,52 @@ msgid "You must be working online to complete this operation"
 msgstr ""
 "������ �� ����� ���������� ��� ������ ��� �� ����������� ���� � ����������"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "������ ���� ������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���� �������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "���� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "��� ���� ������ �� ������� ��� ���������"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "�������� ��� ������ %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "������������ �������"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
@@ -8174,7 +8204,7 @@ msgstr "�� ������ ����������"
 msgid "Invalid arguments to (user-tag)"
 msgstr "�� ������ ����������"
 
-#: camel/camel-filter-search.c:508
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
@@ -8553,7 +8583,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
@@ -8734,31 +8764,134 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "��� ����� ������ �� ������������ � �������: �� ������ �� ���� ��� �������"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "�������� ���� ��� ���������� ��� ��������������."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "�������� ���� ��� ���������� ��� ��������������."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "������ ���������:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_����������� ����������:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
 msgstr ""
-"��������� ������������� ��� %s:\n"
-"\n"
-"%s\n"
-"\n"
-"������ �� �� �������� ����� � �����;"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "������ ���� �� ������� ��� %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "����� ��������"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "�������� ���� ��� ���������� ��� ��������������."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_����������� ����������:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "�� ������ ����������"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_����������� ����������:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_����������� ����������:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8767,16 +8900,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"��������� ������������� ��� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"������ �� �� �������� ����� � �����;"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8835,12 +8985,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2281
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "� ���������� ���������"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2284
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "����������� ���������� ��� ����������: %s"
@@ -8869,40 +9019,40 @@ msgstr "� �������� ��� ���������� ���� ��� �������� ��� ���������� %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� �������� �� ��� ��� ���������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "��� ���� ������ � ���������� ��� ��������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:235
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "��� ���� ������ � ������� ��� ��������� ���  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:301
+#: camel/providers/imap/camel-imap-folder.c:304
 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:526
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "������� ������ ��� ��������� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:1857
-#: camel/providers/imap/camel-imap-folder.c:2351
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "�� ������ ��� ����� ��������� ���� ��� ������"
 
-#: camel/providers/imap/camel-imap-folder.c:2014
-#: camel/providers/imap/camel-imap-folder.c:2091
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "���� ����������� ��������� ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:2020
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "������� ������ ��� ��� ��������"
 
-#: camel/providers/imap/camel-imap-folder.c:2388
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8968,73 +9118,78 @@ msgstr ""
 "�� ��� ������� ���� �� ����� ������� ���� ���������� IMAP �� ����� ������� "
 "����� ��������."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s �������� ��� %s ��� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "� ������� ���������"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "��� ���� ������ � ������� ��� %s (���� %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "� ���������� ��� �������������"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "� ����������� �������."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "� ������� ��� ����� ������"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "� ����������� IMAP %s ��� ����������� ��� ��������� ���� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�� ��������������� ����� ������������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "��� ����� ������� ������ ���������."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9045,31 +9200,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1393
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ������� ������� ������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1661
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "� ������� ��� ����� ������ �� �������� �� ������� ����������."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "��� ����� ������ �� ������� ��� mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9124,7 +9285,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9135,38 +9296,38 @@ msgstr "� ������� ��� root %s ��� ����� ������� ����"
 msgid "Store root %s is not a regular directory"
 msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "��� ����� ������ � ���� ��� �������: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "�� ������� �������� ��� ����� �����������"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "������ ������ ��������� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� %s ��� %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "��� ���� ������ � �������� ��� ������� ��������� ��� ������� `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9227,7 +9388,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9265,26 +9426,26 @@ msgstr "��� ����� ��������� maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "��� ���� ������ � ������ ��� ������� `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "��� ����� ������ �� ������ � ���� ��������� maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "������� ��� ��� ��������"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "������� ������ ��� ��� ��������"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "������� �����������"
@@ -9328,7 +9489,7 @@ msgstr "� ������� �������� �� ���� ������������ �����."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�������� ����������� ���������: �������������  mailbox;"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9337,7 +9498,7 @@ msgstr ""
 "��� ���� ������ �� ������� ��� �������`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9346,14 +9507,14 @@ msgstr ""
 "��� ���� ������ � ���������� ��� �������`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ��� ����� �������� ������."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9362,7 +9523,7 @@ msgstr ""
 "��� ���� ������ � �������� ��� ������� `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "� ������� `%s' ��� ����� ������. ��� ����� � ��������."
@@ -9377,64 +9538,64 @@ msgstr "��� ���� ������ �� ������� ��� �������: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "��� ����� ������ �� �������� � �������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "��� ����� ������ �� ������� ��� �������: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "��� ����� ������ �� ������� ��� ���������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "��� ���� ������ �� �������� ��� ������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "��� ���� ������ �� �������� ��� ���������� �������:%s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "��������� ��������� ��� �������, ����� ��� ���� ��� �����������"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "������� ������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "��� ���� ������ � ����������� ��� ������� : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ���� ��� ������� ��� ���������� mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "� ������� ��� ���������� mailbox �������: %s: %s"
@@ -9585,50 +9746,50 @@ msgstr "�����"
 msgid "Operation failed: %s"
 msgstr "� ���������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "�������� ��������� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "� ���������� ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "��� ����� ������ � ���� ��� �������: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "�������� ��� ������������ ���������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "������ ������ �� uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "�������� ��������� ��� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "��� ������ �� ����� � ���� ��� ���������: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "������� ������������ ������������"
@@ -9738,7 +9899,7 @@ msgid "No such folder `%s'."
 msgstr "��� ������� � ������� `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9767,36 +9928,36 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "��� ���� ������ � ��������� ��� sendmail: %s: �� ������ ��� ��������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "��� ����� ������ � �������� ��� ��������� : %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "�� ��������� sendmail ������������ �� ���� %s: �� ������ ��� ��������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "��� ����� ������ �� ���������� �� %s: �� ������ ��� ��������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "�� ��������� sendmail ������������ �� ��������� %d: �� ������ ��� ��������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "�������� ��������� ���� ��� ������������ sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9911,46 +10072,46 @@ msgstr "��������� �������� ������������"
 msgid "Authentication required"
 msgstr "���������� �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "������ ��������� �����������:%s: ������� ��-�������"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "��� ���� ������ � ������� �� ��� ���������� POP.\n"
 "������ ���� ��� �������� ��� �������� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "�� ������ ������� �� ��� ���� ���������� �����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "� ����������� SMTP %s ��� ����������� ��� ���� ������������ %s ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s�������� �������� ��� ������ ��������� SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9961,94 +10122,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:643
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "����������� SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� ��������� ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: � ��������� ��������� ��� ����� "
 "������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:668 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "������� �������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "��� ����� ������ � �������� ��� ���������: ��� ������������ ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:839
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:870
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "������ HELO ����� ������:%s: ��-�������"
+#: camel/providers/smtp/camel-smtp-transport.c:892
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "������ ���� �������� HELO:%s: ��-�������"
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:955
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "������ ���� ��� ���������� ��� ������������ ������������ SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:978
-#: camel/providers/smtp/camel-smtp-transport.c:990
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "� ������ ������������ �������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "��������� �������� ������������ ��� ��� �����������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "������ MAIL FROM ����� ������: %s: �� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1099
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "������ ��������� MAIL FROM: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "������ RCPT TO ����� ������: %s:�� ������ ��� ��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1139
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1181
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
@@ -10056,92 +10217,92 @@ msgstr "������ DATA ����� ������: %s:�� ������ ��� ��������"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1195
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1235
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "����� ������ � �������� DATA: ����������� ���������:  %s: �� ������ ��� "
 "��������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1267
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "��������� �������� ������������ ��� ��� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1290
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "������ RSET ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1304
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "������ ��������� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1327
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "������ QUIT ����� ������:%s: ��-�������"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "������ ������������ ����� ������: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "������ ��������� RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "���������"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "�������� ����������� ������������ ��� ��� �������� �����������"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "��� ���������..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "��������� ������� ��� ������"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "��� ����� ������ � ��������� ��� ������� %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "��� ����� ������ � ��������� ��� ������� %s: ��� ����� �������� ������"
@@ -10159,11 +10320,11 @@ msgid "MIME type:"
 msgstr "����� MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "������� ��� �������� ������� ��� ����������"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "���� ��� ��� �� ������� �����������"
 
@@ -10174,45 +10335,45 @@ msgstr "���� ��� ��� �� ������� �����������"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "�������� ��:"
 
 #.
-#. * From:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:389
 msgid "From:"
 msgstr "���:"
 
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "�������� ���� ���������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "���������:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�������� ��� ����������� ���� �� ������ ��������� ��� ���������"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "��������� �����������:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10220,17 +10381,25 @@ msgstr ""
 "�������� ��� ����������� ���� �� ������ ��������� ��� ��������� ����� ����� "
 "�� ����������� ���� �������� ���������� ��� ���������."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_����:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "��������� �������"
 
-#: composer/e-msg-composer.c:515
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "��� ���� ������ � ���������� ������������ ��������� PGP."
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10239,34 +10408,34 @@ msgstr ""
 "������ ���� ��� �������� ��� ������� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�������������!"
 
-#: composer/e-msg-composer.c:1062
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "�� ������ �������, �� ����� ���������;"
 
-#: composer/e-msg-composer.c:1084
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1104
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ���� �� ������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1135
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ���� ��� ���������� ��� �������: %s"
 
-#: composer/e-msg-composer.c:1143
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "������� � �������� ��� ��������� ��� ��� �����������"
 
-#: composer/e-msg-composer.c:1150
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10275,14 +10444,14 @@ msgstr ""
 "������� � ��������� ��� ������: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1157
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1166
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10291,7 +10460,7 @@ msgstr ""
 "������ ���� ��� �������� ���������� ��� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1266
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10300,7 +10469,7 @@ msgstr ""
 "����������� ��������.\n"
 "������ �� ����� ���������� �������� ����;"
 
-#: composer/e-msg-composer.c:1412
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10310,39 +10479,39 @@ msgstr ""
 "\n"
 "������ �� ������������ ��� �������;"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "�������������: ������������� ������"
 
-#: composer/e-msg-composer.c:1451
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "������� �������"
 
-#: composer/e-msg-composer.c:1823
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1860
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "���������� ���������"
 
-#: composer/e-msg-composer.c:1901 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1913
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (��' �������)"
 
-#: composer/e-msg-composer.c:2090 composer/e-msg-composer.c:2695
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "�������� ���� ���������"
 
-#: composer/e-msg-composer.c:2712
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10350,7 +10519,7 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ������� ��� �������� �����������."
 
-#: composer/e-msg-composer.c:2738 composer/e-msg-composer.c:2793
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10358,9 +10527,9 @@ msgstr ""
 "��� ���� ������ � ���������� ��� ��������� ��� �����������:\n"
 "������� � ������������ ��� ���������� ��� ����������� HTML."
 
-#: composer/e-msg-composer.c:3620
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10424,8 +10593,8 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� ��� ��������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2248
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10433,12 +10602,11 @@ msgstr ""
 "�������  ��� ������ �� ���� �� �����\n"
 "�� ����� ���������;"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "������������� ��� ������� ���������"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 "������������� ����� ��� ������� ��������� ��� �� �������� ��� ���������"
@@ -10538,122 +10706,72 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:81
-msgid "year"
-msgstr "������"
-
-#: filter/filter-datespec.c:81
-msgid "years"
-msgstr "������"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "������������"
 
-#: filter/filter-datespec.c:82
-msgid "month"
-msgstr "�����"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "�����"
 
-#: filter/filter-datespec.c:82
-msgid "months"
-msgstr "�����"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "���"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "��������"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "���������"
 
-#: filter/filter-datespec.c:85
-msgid "hour"
-msgstr "���"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "�����"
 
-#: filter/filter-datespec.c:86
-msgid "minute"
-msgstr "�����"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "�����"
 
-#: filter/filter-datespec.c:87 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "������������"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "������"
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "������"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "�������� �� ��������� ����������."
 
-#: filter/filter-datespec.c:198
-msgid "You have chosen an invalid date."
-msgstr "��� ����� �������� ������ ����������"
-
-#: filter/filter-datespec.c:283
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"� ���������� ��� ��������� �� ��������� ��\n"
-"�� ��� ��� ��� ������� ���� ���������� �� ������\n"
-"� �� �������� � ��������."
-
-#: filter/filter-datespec.c:306
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"� ���������� ��� ��������� �� ��������� ��\n"
-"��� ��� ��� ������ ���."
-
-#: filter/filter-datespec.c:346
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"� ���������� ��� ��������� �� ��������� ��\n"
-"�� ��� ������� ���� ���������� �� ������\n"
-"��� ���������� \"���� ��� ��������\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:381
-msgid "the current time"
-msgstr "� �������� ���"
-
-#: filter/filter-datespec.c:381
-msgid "a time you specify"
-msgstr "� ��� ��� �������"
-
-#: filter/filter-datespec.c:382
-msgid "a time relative to the current time"
-msgstr "� ��� ������� �� ��� �������� ���"
-
-#. The dialog
-#: filter/filter-datespec.c:406
-msgid "Select a time to compare against"
-msgstr "�������� ��� ��� ��� �� ����������"
-
-#. The label
-#: filter/filter-datespec.c:440
-msgid "Compare against"
-msgstr "�������� ��"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<����� ���� ��� ��� �� ��������� ����������>"
 
-#: filter/filter-datespec.c:558 filter/filter-datespec.c:737
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "����"
 
-#: filter/filter-datespec.c:587
-msgid " ago"
-msgstr " ����"
-
-#: filter/filter-datespec.c:633
-msgid "ago"
-msgstr "����"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:723 mail/message-list.c:1105
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " ����"
 
-#: filter/filter-datespec.c:734
-msgid "<click here to select a date>"
-msgstr "<����� ���� ��� ��� �� ��������� ����������>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "�������� ��� ��� ��� �� ����������"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "������� �������"
 
@@ -10667,7 +10785,7 @@ msgstr "����� ����:"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "� ������� ��� root %s ��� ����� ��������� ���������"
 
-#: filter/filter-file.c:302
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "�������� ��� ��������:"
@@ -10690,7 +10808,7 @@ msgstr ""
 "��������� ���� ��� ������ ���� ������ ������ ��� ��� �������� ��� ���������."
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "������� �������"
 
@@ -10701,14 +10819,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "���������"
 
 #. red
 #: filter/filter-label.c:137 mail/mail-config.c:76
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Work"
 msgstr "���������"
@@ -10721,7 +10839,7 @@ msgstr "������"
 
 #. forest green
 #: filter/filter-label.c:139 mail/mail-config.c:78
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 #, fuzzy
 msgid "To Do"
 msgstr "�����"
@@ -10736,84 +10854,133 @@ msgstr "����"
 msgid "Test"
 msgstr "������"
 
-#: filter/filter-rule.c:219
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "������ �� ������ ����� �' ���� �� ������."
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "'����� ������: "
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "����� �����"
 
-#: filter/filter-rule.c:781
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "��"
 
-#: filter/filter-rule.c:799
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "�������� ���������"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "�� ������������� ��� �� ��������"
 
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "�� ������������� ������ ��� �� ��������"
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "�������� ���������"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "�����������"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "����������"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "�������� ��"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "����������� �������"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "����������� ��������"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "�����������"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "����������"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"� ���������� ��� ��������� �� ��������� ��\n"
+"��� ��� ��� ������ ���."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"� ���������� ��� ��������� �� ��������� ��\n"
+"�� ��� ������� ���� ���������� �� ������\n"
+"��� ���������� \"���� ��� ��������\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"� ���������� ��� ��������� �� ��������� ��\n"
+"��� ��� ��� ������ ���."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "��������� �������"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "� ��� ������� �� ��� �������� ���"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "����"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "��� ��� �������������� ��������"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "� �������� ���"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "� ��� ��� �������"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "����� ��������"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "�� ����� ���� �������� ��������������� ��������"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "�� ����� ���� �������� ��� �������� ��������������� ��������"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "�� ����� ���� �������� ��������"
 
@@ -10840,42 +11007,42 @@ msgid "Beep"
 msgstr "������"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "��������"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "��������� �� ������"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "��� ��������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "��� ��������� ��"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "��� �������"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "��� �������"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "��� �������� �� �����"
@@ -10897,88 +11064,89 @@ msgid "ends with"
 msgstr "�������� ��"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "����� ���������� ���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "����� ��������� ���"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "��� �����"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1726
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "_����������"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "����� ������������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "���������� �� ������"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "�������� ��������� ��� �����"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "�������� ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����������"
 
@@ -10994,57 +11162,87 @@ msgstr ""
 msgid "Replied to"
 msgstr "���������� �����"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "���."
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "����� ���������� ���"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "����� ��������� ���"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1555
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "������� ����������"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������� (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "�������� �� �����"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "������� �����������"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "������ ��"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "����������� ������������"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "������� ����������"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "�������� ������"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "����������� ������"
 
@@ -11088,7 +11286,7 @@ msgstr "������� ������ ��� %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:315
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "��������"
 
@@ -11154,7 +11352,7 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "�� Evolution ������� �� ������ ��� �������� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1076
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�����������"
@@ -11315,7 +11513,7 @@ msgstr "���������..."
 msgid "Change this folder's properties"
 msgstr "������ ��� ��������� ��� �������"
 
-#: mail/component-factory.c:759
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11323,246 +11521,261 @@ msgstr ""
 "������� ��� ��� ��������� ��� ������������ ��� �������� �� ����� "
 "��������������, �������� ������� ��� ��� ����� �����."
 
-#: mail/component-factory.c:921
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "��� ����� ������ ����� �������� ��� ���������"
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:949
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "�������������: ������������� ������"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "��� ������ ������������"
 
-#: mail/component-factory.c:990 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_�������� ���������"
 
-#: mail/component-factory.c:991
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "�������� ���� ���������"
 
-#: mail/component-factory.c:1018
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "��� ������"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "����������� ������"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "�������� ���� ���������"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ��������� ��� Evolution."
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� �������� ��������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1033
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "��� ����� ������ � ������������ ��� ���������� ����������� ������� ��� "
 "Evolution."
 
-#: mail/component-factory.c:1258 mail/component-factory.c:1288
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "������� ���� ����������..."
 
-#: mail/component-factory.c:1299
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "��� ����� ������ �� ����� ���������� ����������� �� �������"
 
-#: mail/folder-browser-ui.c:428
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "��������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:430
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "���������"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d ���"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d ����������"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d �� �����������"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d �����������"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d ��������"
 
-#: mail/folder-browser.c:1092
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "���������� ��������� ������� ��� �� ������"
 
-#: mail/folder-browser.c:1662
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "�������� ��� _����"
 
-#: mail/folder-browser.c:1663
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "�������� ���� _���������"
 
-#: mail/folder-browser.c:1664
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "�������� ����� ����������"
 
-#: mail/folder-browser.c:1665
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "�������� ���� ����� _������������"
 
-#: mail/folder-browser.c:1669
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "������ ��� ����"
 
-#: mail/folder-browser.c:1670
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "������ ���� ���������"
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "������ ����� ����������"
 
-#: mail/folder-browser.c:1672 mail/folder-browser.c:2006
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "������ ���� ����� ������������"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_����������� �� ��� ������..."
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_�������� ���� ���������"
 
-#: mail/folder-browser.c:1697 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� ��� _�����"
 
-#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� �� _�����"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_��������"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "������������"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "����������"
 
 #. separator here?
-#: mail/folder-browser.c:1709 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "������� _�� �����������"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "������� _�� �� �����������"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "������� _�� ���������"
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "������� _�� �� ���������"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_������ ���������"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: mail/folder-browser.c:1722 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�������� ��������� ��� ������ �����������"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�������� �������"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "���������� ������ ��� �� ������"
 
-#: mail/folder-browser.c:2007
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�������� ���� ����� ������������"
 
-#: mail/folder-browser.c:2009
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ ���� ����� ������������ (%s)"
 
-#: mail/folder-browser.c:2010
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�������� ���� ����� ������������ (%s)"
@@ -11636,20 +11849,20 @@ msgstr "��� ����� ����������� ��� ��� ������������ �����������."
 msgid "Evolution Account Editor"
 msgstr "������������ ����������� Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:158
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:128
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_����� ������:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_����:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "��� ����������� �� ������������� ��� ������������ �� �� ���� �����."
 
@@ -11697,30 +11910,30 @@ msgstr "������� ����"
 msgid "Mail to %s"
 msgstr "������ ��� ���/��� %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "�� ���� ����� %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "������ ��� ���/��� %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s ����� ������������"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "�������� ������ �������"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11732,7 +11945,7 @@ msgstr ""
 "    '%s'\n"
 "��� ���� ���������."
 
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11744,7 +11957,7 @@ msgstr ""
 "� �������� ���������\n"
 "������ �� ������ ��� ������� ����;"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11752,7 +11965,7 @@ msgstr ""
 "������ �� ��������� ��� ���������\n"
 "���� ��� ��� �������� ���������"
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11761,7 +11974,7 @@ msgstr ""
 "���� ��� ��� �������� ���������"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:198
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11769,11 +11982,11 @@ msgstr ""
 "�� �������� ������ �� ����� HTML, ���� � �������� ���������� ��� ��������� "
 "�������� �� ����� HTML:\n"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11781,7 +11994,7 @@ msgstr ""
 "���� �� ������ ��� ���� ����.\n"
 "�� ������;"
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11790,12 +12003,12 @@ msgstr ""
 "�����������, ���� �� ������ �� �������� ���� ���������� ���� ��������� "
 "�����������(Bcc)."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 "���� �� ������ �������� ���� ���������� ��� ���������� ������������Bcc)."
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11805,11 +12018,11 @@ msgstr ""
 "�������� ��� ������ ����������� ����.\n"
 "�� ������ ����� � �����;"
 
-#: mail/mail-callbacks.c:426
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "������ �� ������� ���������� ����������� �� �������� ���� �� ������."
 
-#: mail/mail-callbacks.c:615
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11818,28 +12031,28 @@ msgstr ""
 "����������.\n"
 "������ �� ������ ����� ��� ��' ������� ���������� �������;"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "���� �������� ����������"
 
-#: mail/mail-callbacks.c:996
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "���� %d/%b/%Y, ����� %A ��� ��� %H:%M, �/� %%s ������:"
 
-#: mail/mail-callbacks.c:1436 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "���������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:1438 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "��������� ���������(��) ���"
 
-#: mail/mail-callbacks.c:2092
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "����� ������� ��� ������ �� �������������� ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2117
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11847,7 +12060,7 @@ msgstr ""
 "����������� �� �������������� ���� ��\n"
 "�������� ���� �������� ������."
 
-#: mail/mail-callbacks.c:2156
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11855,39 +12068,39 @@ msgstr ""
 "����������� �� ������������ ���� ��\n"
 "�������� ��� ��� ������ �����������."
 
-#: mail/mail-callbacks.c:2170
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "����� ������� ��� ������ �� ������������ ��� �� %d ��������;"
 
-#: mail/mail-callbacks.c:2196
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "��� ���� �������� ������"
 
-#: mail/mail-callbacks.c:2241 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "��������� �������;"
 
-#: mail/mail-callbacks.c:2295
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2297
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "���������� ��������� ��..."
 
-#: mail/mail-callbacks.c:2368
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "�������� �������� �� ������������ ���������"
 
-#: mail/mail-callbacks.c:2375
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2618
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11899,7 +12112,7 @@ msgstr ""
 "\n"
 "����� ������� ��� ��� �������� ��� ���������;"
 
-#: mail/mail-callbacks.c:2731
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11908,28 +12121,28 @@ msgstr ""
 "������ ���� �� ������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2743
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "������"
 
-#: mail/mail-callbacks.c:2787
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���� ��������� %d ��� %d"
 
-#: mail/mail-callbacks.c:2840
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "�������� ���������"
 
-#: mail/mail-callbacks.c:2867
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "���������� US-Letter"
 
-#: mail/mail-callbacks.c:2906
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "������� � �������� ��� ���������"
 
-#: mail/mail-callbacks.c:3093 mail/mail-callbacks.c:3134
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11951,7 +12164,7 @@ msgstr "����� ���������"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2768
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "����� ����� �����"
@@ -11972,10 +12185,11 @@ msgid "Add Signature"
 msgstr "���������� ���������"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "�������� �������� �� ����� ��� ��� ��� ����������� ��� ��������� ��"
 "\"�����������\" ����� ��� ������������ ��������\n"
@@ -11983,10 +12197,10 @@ msgstr ""
 "��� ����������� ���� �������� ��������."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�������� �������� ����������� ��� ��� ���������� ������������ ���������. �� "
 "��� ����� ������� �������\n"
@@ -11997,24 +12211,23 @@ msgid "Please select among the following options"
 msgstr "�������� �������� ������� ������� ���� �������� ��������"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�������� �������� ��� ����������� ������� �� ��� ����� ��������� ��� "
 "���������. �� ��� ����� ������� ������� ��� �����������\n"
 "������� ��� � ��� ������� ����������."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "����� ������ ��������� �� ��� ���������� �������� ��� ������������. � "
 "��������� � ����������� ������������\n"
@@ -12024,20 +12237,20 @@ msgstr ""
 "�� ����� ����� ���� ��� �� �������� ��� ����������."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "������ ����������� Evolution"
 
-#: mail/mail-config.c:617
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�����������"
 
-#: mail/mail-config.c:2488
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "������� ������� ���������"
 
-#: mail/mail-config.c:2566 mail/mail-config.c:2570
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "������� ���� ����������..."
 
@@ -12412,119 +12625,124 @@ msgstr "������������� ��� ������� ���������"
 msgid "Required Information"
 msgstr "������������ �����������"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "��' �������"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "������� MIME"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "�������� �� ���������� PGP"
 
-#: mail/mail-config.glade.h:107 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������������� �� ��������"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "������� _������������ ���������:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "����������� ��� �������� ��������"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "� _����������� ������� �����������"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "��������� ����������"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "����� _����������: "
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "���������� ���������"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "����� ����:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 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:124
+#: mail/mail-config.glade.h:125
 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:126
+#: mail/mail-config.glade.h:127
 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:129
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12534,200 +12752,200 @@ msgstr ""
 "\n"
 "�������� \"�������\" ��� �� ����������. "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "�� ������� _����� ������� ��� ������� ��� �� �������"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "�� _������������ ����� �� �������� ���� ����� ����� ��� �����������"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "����� _������������: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_��������� ������� ��� ��� ��������"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_����������� ����������:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "����������� ���� �������� ��� ���� ������"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "��' �������"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�������� ��"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_������ �����:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�� �������� HTML"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_������� ������� �� � ���������� ������� ��� ������ �����������"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "����� ����� � _��' ������� �����������"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_������� ��������� �� ����������� ���� ���"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_�����:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_�� ��� ����������� ���� ������� ��� �� ������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "���� ����������� _PGP:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 #, 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:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������� ���� �������� ��������� �� �_���� ����"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "������� ���� ���������"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� �� �����"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:174 ui/evolution-message-composer.xml.h:48
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_��������"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�������� ���������"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "�������� ���� ��"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_�������� HTML:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "����� �������� �������� (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_����"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " �����"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "���������"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12751,207 +12969,216 @@ msgstr "��� ���� ������ � ���������� ������������ ������� S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "��� ���� ������ � ���������� ������������ ���������������� S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "���������� ����������..."
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "��� ����� ������ � ���������� ��� ���������� ���������: %s"
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:430
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "���������� ����������..."
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "������� ���� ��� ������"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "������� �� %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "������� ���� ��� ������ (���� %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "��������"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "��������� ��������� ��������"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "������� _�������"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "������� ����������� ���������"
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "�������� ��� ����� ����:"
 
-#: mail/mail-display.c:1830
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "������� ��������� ���� ���������"
 
-#: mail/mail-display.c:1831
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "��������� ����� �����������"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "���������� ������� ��..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr " %s ���������"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "��� ���� ������ � ������� ��� ��������� MIME. ������� �� ����."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����������"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "��������� ���������"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "�������� ��"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "���������:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "��������� �����������"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "������������ ������������: "
 
-#: mail/mail-format.c:1737
-#, fuzzy
-msgid "View messages..."
-msgstr "���������� ��������� ��..."
-
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "���� �� ������ ����� ������� �������������. ����� ���� ��� ��������� �� �� "
 "������� ��� ������������ �����������."
 
-#: mail/mail-format.c:1860
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "��� ���� ������ � ���������� ������������ ����������� PGP."
 
-#: mail/mail-format.c:1869
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ������� �� ����� ���������."
 
-#: mail/mail-format.c:1877
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "���� �� ������ ����� ������� ������������� ��� ��� ������� �� ����� "
 "���������."
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "������� �� ������ FTP (%s)"
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "������� �� ������ ������ (%s) ������ ���� ������ \"%s\""
 
-#: mail/mail-format.c:2146
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "������� �� ������ ������ (%s)"
 
-#: mail/mail-format.c:2175
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "������� �� ������������� �������� (%s)"
 
-#: mail/mail-format.c:2183
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "������� �� ������� ��������� �������� (����� \"%s\")"
 
-#: mail/mail-format.c:2188
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "��������������� ��������� ����� ���������."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "������� �������"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "������������ �������"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "��� ����� ������ �� ����������� � ������� metainfo, ������ �� ������������\n"
 "��� ��� �������� �� �������� ����� ����� ��� ������: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "��� ����� ������ �� ����������� � ������� metainfo ��� %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "��� ���� ������ �� ��������� � ������� metadata %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "������� ������ ��� ������� \"%s\" �� ����� \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ��� ����� ������ �� ��������� ���� ����� ��� ����� ������� �������"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12959,16 +13186,16 @@ msgstr ""
 "�� ��� �������� �� �������� ����� ���� �� maibox, ����\n"
 "�� ������ �� �� ����������� ����� ���."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "��� �������� �� �������� �� ����� ���� ��-������� �������."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "���������� ���� � /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12977,7 +13204,7 @@ msgstr ""
 "������ ���� '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12986,7 +13213,7 @@ msgstr ""
 "������ ���� ��� �������� ��� �����������:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "���������"
 
@@ -12994,100 +13221,100 @@ msgstr "���������"
 msgid "Filtering Folder"
 msgstr "����������� �������"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "���� ���������"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "���'��� ���� �� ������ �������� �� ��������."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "������������ \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d ��� %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "�������� ��� ������ %d ��� %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "������������."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "���������� ��������� ���� ������"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "���������� ��������� ��� %s"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "��������� ��������� ��� %s"
 
-#: mail/mail-ops.c:1026
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������ ������� ��� \"%s\""
 
-#: mail/mail-ops.c:1209
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "���������� ��������"
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "������� ������� %s"
 
-#: mail/mail-ops.c:1324
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "������� �������� %s"
 
-#: mail/mail-ops.c:1393
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "���������� � ������� %s"
 
-#: mail/mail-ops.c:1487
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "������������ � ������� '%s'"
 
-#: mail/mail-ops.c:1538
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "����������� � �������"
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�������������� �� ������ %s"
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������������� %d ������(��)"
 
-#: mail/mail-ops.c:1781
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "����������� %d ������(��)"
 
-#: mail/mail-ops.c:1893
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13096,7 +13323,7 @@ msgstr ""
 "��� ����� ������ � ���������� ��� ������� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13105,11 +13332,11 @@ msgstr ""
 "������ ���� ��� ���������� ��������� ��� %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "���������� ����������"
 
-#: mail/mail-ops.c:2012
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13118,27 +13345,22 @@ msgstr ""
 "��� ����� ������ � ���������� ������� ������: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "��� ���� ������ � ������� ���������:%s"
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� ��� �� %s"
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "������������ ��� %s"
 
-#: mail/mail-ops.c:2271
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:512
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_���������"
 
@@ -13209,16 +13431,26 @@ msgstr "��������..."
 msgid "Waiting..."
 msgstr "�������..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "� ������� ������� ��� ����������."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_������������� ����� ��� �������"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+"������������� ����� ��� ������� ��������� ��� �� �������� ��� ���������"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�������� ������ ��������� ��� %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "�������� ������ ���������"
 
@@ -13245,7 +13477,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "�����:"
 
@@ -13289,7 +13521,7 @@ msgstr "������� ��������: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� �������� ��� �� uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13302,25 +13534,24 @@ msgstr ""
 "    '%s'\n"
 "��� ���� ���������."
 
-#: mail/mail-vfolder.c:728 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "��������"
 
-#: mail/mail-vfolder.c:790
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "��������"
 
-#: mail/mail-vfolder.c:832
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "����������� ��������"
 
-#: mail/mail-vfolder.c:848
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "���������� ������������ �������� '%s' ��� ��� �������."
 
-#: mail/mail-vfolder.c:902
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "���� ��������"
 
@@ -13333,63 +13564,67 @@ msgstr "(����� ����)"
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "����������"
 
-#: mail/message-list.c:725
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:726
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "�������� ��������"
 
-#: mail/message-list.c:730
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "����������"
 
-#: mail/message-list.c:731
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:735
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "�����"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "���������"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "������ %l:%M %p"
 
-#: mail/message-list.c:1085
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1097
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2539
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "���������� ������ ���������"
 
@@ -13424,47 +13659,47 @@ msgstr "������"
 msgid "Size"
 msgstr "�������"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "����"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "�������� �������"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "����������� �����"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�������� �� �����"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "�������������"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13488,16 +13723,16 @@ msgstr "�������� ���� ������ \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "��������� ��������� ���� ������ \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�������"
 
-#: mail/subscribe-dialog.c:1516
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "��� ���� �������� �����������"
 
-#: mail/subscribe-dialog.c:1577
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "�������� �������� ����������."
 
@@ -18443,11 +18678,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24492,8 +24727,8 @@ msgstr "����� ���������"
 msgid "Mail summary"
 msgstr "������ ���������"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:412
-#: my-evolution/e-summary-mail.c:740 shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "������� �������"
 
@@ -24511,15 +24746,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Word of the Day"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "������� ������"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "�������� ����������� ��������"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��������� ��� ����������� ��������� ��� ���� ��� ������ �� ����������"
 
@@ -24531,26 +24766,26 @@ msgstr "������ ���� ��� ���� ��� RDF"
 msgid "News Feed"
 msgstr "���������� ��������"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_��������"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�������"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "��� �������� ��������"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(����� ���������)"
 
@@ -25828,7 +26063,8 @@ msgid "Tasks "
 msgstr "��������"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "��������� ������"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25904,7 +26140,7 @@ msgid "Drafts"
 msgstr "��������"
 
 #: shell/e-local-storage.c:179 shell/e-shell-view.c:397
-#: shell/e-shortcuts.c:1061
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "�����������"
 
@@ -26153,8 +26389,9 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - ���������� ���� �������"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "���������� _���� �������.."
 
 #: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
@@ -26361,9 +26598,14 @@ msgstr "������� ������� %s"
 msgid "in \"%s\" ..."
 msgstr "������� �� %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "��� ���� ������ � ����������� ��� ������� : %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "��� ���� ������ � ���������� ��� ������������� �������:\n"
 "%s"
@@ -26384,8 +26626,8 @@ msgstr ""
 "��� ����� ������ � ������������ ��� �������� ��� ������ ������������ ��� "
 "Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "���"
@@ -26426,23 +26668,24 @@ msgstr "�������� ��� ������..."
 msgid "Select the folder that you want to open"
 msgstr "�������� ��� ������ ��� ������ �� ��������"
 
-#: shell/e-shell-view-menu.c:597 ui/evolution.xml.h:11
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "���������� ���� �����������"
 
-#: shell/e-shell-view-menu.c:598
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� ��� ������ ��� �� �������� �� ��� ����������:"
 
-#: shell/e-shell-view-menu.c:765
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:778 ui/evolution.xml.h:62
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "������� �_���� �������"
 
-#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "����� ����� �������"
 
@@ -26550,87 +26793,97 @@ msgstr "����������� ����� �����������"
 msgid "Rename selected shortcut group to:"
 msgstr "����������� ��� ����������� ������ ������������ ��:"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "����� ���������"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "�������� ��� ������������ �� ����� ���������"
 
-#: shell/e-shortcuts-view.c:231
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "������ ���������"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "�������� ��� ������������ �� ������ ���������"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_��� �����..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "���������� ���� ������ ������������"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_�������� ����� ��� ������..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "�������� ����� ��� ������ ������������"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_����������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "����������� ������ ������������"
 
-#: shell/e-shortcuts-view.c:255
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "�_������� ������� ������������"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "�������� ������� ������������"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "���������� ���� �����������"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "���������� ���� �����������"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:376
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "����������� ����������� ����������� ��:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "������� ��� ������� ��������� �� ���� ��� ����������"
 
-#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "������� �� _��� ��������"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������� ��� ������� ��������� �� ���� ��� ���������� �� ��� ��������"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_�����������"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "����������� �����������"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_��������"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�������� ����� ��� ����������� ��� ��� ������ ������������"
 
@@ -26638,7 +26891,7 @@ msgstr "�������� ����� ��� ����������� ��� ��� ������ ������������"
 msgid "Error saving shortcuts."
 msgstr "������ ���� ��� ���������� ��� ������������."
 
-#: shell/e-shortcuts.c:1053
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "������������"
 
@@ -26752,63 +27005,63 @@ msgstr ""
 "�� ������ ��� �� ������� ������������� �����:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "����� �������"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "�� ������ ����������"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "���� ��� ���������"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "����� ���������"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "��� �������"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "� ����� ��� �������������"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "� ���������� ��� �������������"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "��������� ������"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "�� ������ URI"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "���� �����������"
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "��� ���� ������ ��������� �����"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "� ������� ���������� ���� �������"
 
@@ -27107,122 +27360,110 @@ msgstr "��������� ��� ��������"
 msgid "Copy to Folder..."
 msgstr "��������� ��� ������..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "���������� ���� ������"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "���������� ���� ������ ������"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "������� ��� ��������"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "�������� ����������� ������"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "���������� ����������� ��������� �� ���� ������"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "���������� ��� ���������"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "������������� ��� ������ ���� ��������"
 
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-calendar.xml.h:16
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_������������� ���������"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "�������� ����������� ������"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "���������� ����������� ������ �� VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "������� ����"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "������� ���� ��� ������"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "������� ��� ������ ���� ����������� ������."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "�������� ��������� �� �����"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "�������� ��� ����������� ������ �� ���� �����"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "�����������"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "����������� ��������"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "� �������� ���"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "�_��������"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_����� ������"
-
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_�������� ������..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_���������� ��� ������..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_���������� �� VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_��������� ������"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_������� ����"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "�������� _��������� �� �����..."
@@ -27325,7 +27566,7 @@ msgid "Print this item"
 msgstr "�������� ����� ��� ���������"
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "����������"
 
@@ -27477,27 +27718,37 @@ msgstr ""
 "�������� �������� ���� ��� ������������ ��������� ��� ����� ���� ��������"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "��� ������"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "���������� ��������� ���� ������"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "�������� ������ ��������������"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "�������� � ��������� ��������� �� �������� �� ��������������� �����������"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_������������ ��������� �������"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_������..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_����� ��������������"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_�������� ����� ��������..."
 
@@ -27860,170 +28111,180 @@ msgstr "����������� �� ����������� ������"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "�������� ��������"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "������� ��� ��� �������� �� ����� ���� ��������"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "����������� ��������� ������"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "������������� ��� ��������� ���� ��������"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "�����������"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "�������� ��� ����������� ��������� �� �������"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "��������� ��� �������� ��� �������� �������"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "���_������ ���������..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_���������"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "���������� ��� ��������� �� ������ ��������"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "������ �������� ��� ���� ��� ��������� ��� ��������"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "�������� ��� ���������� ������� ��� ��� �������� ��������"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "�������� _����� ���������"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "�������� ���� ��� _������������"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "�������� ��������� �� �������� �����"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "�������� ��������� �� ���� ��� ������������ ������������ ������������"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "���� �������� ��� ����� ��� ���������"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_������� ��������"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "��-�������� ��� ����������� ���������"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "�������� ���� _����� ������������..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "�������� ���� _���������..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "�������� ����� _����������..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "�������� ��� _����..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "���������"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_��������� �� ������"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_���������� ������� ��� �� ������"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_�������� ���������"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "�������� ���"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "���� ��� ������"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_����������"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_������� ���������"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_���������� �� ������"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "������� ������"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_�������� �������"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_������� ���������"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "����������� ������"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "�� �������"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
 msgstr "_�����������..."
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:60
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_��������"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "�_������� ���������"
 
@@ -28039,7 +28300,7 @@ msgid "_Close"
 msgstr "_��������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:61
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_�������"
 
@@ -28068,8 +28329,9 @@ msgstr ""
 msgid "For_mat"
 msgstr "_�����"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -28204,12 +28466,16 @@ msgstr "�_������..."
 msgid "_Reply-To Field"
 msgstr "_����� ���������"
 
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
 #: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "���������� ����� ��� ��������� ��� �������� ��� ������ ��������"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:50
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_�������"
 
@@ -28339,6 +28605,10 @@ msgstr "���������� ��������� �� ����� ��� ������ ���� ������ ������������ "
 msgid "Create a new folder"
 msgstr "���������� ���� �������"
 
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "���������� ���� �����������"
+
 #: ui/evolution.xml.h:12
 #, fuzzy
 msgid "Create a new window displaying this folder"
@@ -28461,46 +28731,52 @@ msgid "_Folder Bar"
 msgstr "_������ �������"
 
 #: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_�������"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_�������� ���� ������..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_��������..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_����������..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_���"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "���� _�������"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 #, fuzzy
 msgid "_Preferences..."
 msgstr "_����� ������������"
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_�����������..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_�������� / ����"
 
-#: ui/evolution.xml.h:58
-msgid "_Shortcut"
-msgstr "_����������"
-
 #: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_������ ������������"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_����������"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "�������� ��������"
@@ -28739,11 +29015,11 @@ msgstr "������������ ����������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "������������ ����������"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "���������� ����������"
 
@@ -28783,12 +29059,12 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "�� ��� �������������� ���� �� ������"
 
-#: widgets/misc/e-search-bar.c:518
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "������ ����"
 
-#: widgets/misc/e-search-bar.c:519
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "����������"
@@ -28811,18 +29087,58 @@ msgstr "� ����������� ���������� ������� �����������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "� ���������� ������������ �����������, ���������� �����������"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): ��� ���� ������ � ������������ ��� GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): ��� ���� ������ � ������������ ��� GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "������ ��������� �����������:%s: ������� ��-�������"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "������ HELO ����� ������:%s: ��-�������"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "������ ���� �������� HELO:%s: ��-�������"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "������ QUIT ����� ������:%s: ��-�������"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "��� ����� �������� ������ ����������"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "� ���������� ��� ��������� �� ��������� ��\n"
+#~ "�� ��� ��� ��� ������� ���� ���������� �� ������\n"
+#~ "� �� �������� � ��������."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "���������� ��������� ��..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - ���������� ���� �������"
+
+#~ msgid "Create new contact"
+#~ msgstr "���������� ���� ������"
+
+#~ msgid "Create new contact list"
+#~ msgstr "���������� ���� ������ ������"
+
+#~ msgid "_Contact List"
+#~ msgstr "_����� ������"
+
 #~ msgid ""
 #~ "Evolution is unable to get the addressbook local storage.\n"
 #~ "This may have been caused by the evolution-addressbook component "
@@ -29068,10 +29384,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgstr "���������"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "������ ���������:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "�������� ���� ����� ��� ���������"
 
@@ -29688,9 +30000,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_����������:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_������������� ����� ��� �������"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�������� ��������� �� ������� �� ����� HTML."
 
@@ -29779,9 +30088,6 @@ msgstr "init_bonobo(): ��� ���� ������ � ������������ ��� Bonobo"
 #~ "������������ � �������������� ������������ ������������ ��� ����� "
 #~ "�����������"
 
-#~ msgid "New Message"
-#~ msgstr "��� ������"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_��������� �������������..."
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 18ba28ad56..f1c55d076e 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: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
@@ -342,45 +342,45 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr ""
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr ""
 
@@ -470,11 +470,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr ""
 
@@ -490,21 +490,28 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
+#: addressbook/gui/component/addressbook-component.c:565
+msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:197
@@ -523,24 +530,24 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise gnome-vfs"
 
@@ -549,18 +556,18 @@ msgstr "Could not initialise gnome-vfs"
 msgid "Other Contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -568,48 +575,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -726,7 +733,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr ""
@@ -810,8 +817,8 @@ msgstr ""
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr ""
 
@@ -861,8 +868,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr ""
 
@@ -1044,15 +1051,15 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
@@ -1092,12 +1099,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr ""
@@ -1200,10 +1207,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr ""
 
@@ -1232,30 +1239,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:544
+msgid "Find contact in"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -1277,14 +1266,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr ""
 
@@ -1387,11 +1372,12 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
@@ -2621,7 +2607,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr ""
 
@@ -2680,7 +2666,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr ""
 
@@ -2707,21 +2693,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr ""
 
@@ -2729,8 +2715,8 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr ""
 
@@ -2747,7 +2733,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2768,46 +2754,50 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+msgid "Addressbook does not exist"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2815,19 +2805,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr ""
 
@@ -2899,7 +2889,7 @@ msgstr ""
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
@@ -2932,7 +2922,7 @@ msgid "Pilot Settings..."
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
@@ -2941,8 +2931,8 @@ msgid "Send Message to Contact"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
@@ -2960,7 +2950,7 @@ msgid "Move to folder..."
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
@@ -2971,20 +2961,20 @@ msgid "Copy"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr ""
 
@@ -3140,7 +3130,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr ""
 
@@ -3230,26 +3220,26 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
@@ -3369,11 +3359,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3381,13 +3371,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3398,7 +3388,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3426,7 +3416,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3437,7 +3427,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3459,17 +3449,17 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3494,37 +3484,37 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3532,56 +3522,55 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr ""
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr ""
 
@@ -3589,12 +3578,12 @@ msgstr ""
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
 
@@ -3602,36 +3591,52 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr ""
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
-msgid "New All Day Appointment"
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
-msgid "All _Day Appointment"
+#: calendar/gui/component-factory.c:723
+msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
+#: calendar/gui/component-factory.c:723
+msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
+#: calendar/gui/component-factory.c:724
+msgid "Create a new all-day appointment"
 msgstr ""
 
 #: calendar/gui/control-factory.c:123
@@ -3697,7 +3702,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr ""
 
@@ -3705,11 +3711,13 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr ""
 
@@ -3837,7 +3845,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3866,7 +3874,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr ""
 
@@ -4040,7 +4048,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr ""
 
@@ -4080,19 +4088,33 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
@@ -4160,61 +4182,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4413,7 +4435,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4425,7 +4447,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4506,7 +4528,7 @@ msgstr ""
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
@@ -4527,7 +4549,7 @@ msgstr ""
 msgid "Other Date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
@@ -4625,20 +4647,26 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Progress"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+msgid "Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr ""
 
@@ -4652,7 +4680,7 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4721,76 +4749,76 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4799,8 +4827,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr ""
 
@@ -4828,11 +4856,9 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr ""
 
@@ -4871,105 +4897,104 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5010,7 +5035,7 @@ msgstr ""
 msgid "Task Due: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr ""
 
@@ -5019,328 +5044,333 @@ msgstr ""
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr ""
 
@@ -5385,7 +5415,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr ""
 
@@ -5398,57 +5428,52 @@ msgid "Non-Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr ""
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr ""
 
@@ -5538,46 +5563,43 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr ""
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5588,11 +5610,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Synchronising folder"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -5649,51 +5676,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -5920,9 +5952,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr ""
 
@@ -5951,8 +5982,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr ""
 
@@ -6004,125 +6035,137 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr ""
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7710,71 +7753,79 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7828,7 +7879,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7836,46 +7887,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -7883,17 +7934,17 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, 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"
@@ -7919,22 +7970,22 @@ msgid "Could not lock '%s'"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -7993,11 +8044,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8117,7 +8172,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8284,26 +8339,124 @@ msgstr "Can not get folder: Invalid operation on this store"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+msgid "Error in CRL"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:593
+msgid "Out of memory"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Invalid purpose"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8312,16 +8465,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8336,32 +8501,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, c-format
+msgid "Error storing `%s': %s"
+msgstr ""
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 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:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -8369,12 +8539,12 @@ msgstr "Can not rename folder: %s: No such folder"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8403,40 +8573,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8445,10 +8615,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -8461,7 +8631,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr ""
 
@@ -8491,7 +8661,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr ""
 
@@ -8499,69 +8669,73 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, c-format
+msgid "The folder %s no longer exists"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8569,31 +8743,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Can not open mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -8615,7 +8795,9 @@ msgid "Local delivery"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8641,12 +8823,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8657,38 +8839,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -8746,7 +8928,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8782,24 +8964,24 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Can not open maildir directory path: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Synchronising folder"
@@ -8843,35 +9025,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -8886,64 +9068,64 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error writing to temporary mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Writing to temporary mailbox failed: %s: %s"
@@ -9089,49 +9271,49 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr ""
 
@@ -9148,7 +9330,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr ""
 
@@ -9169,6 +9351,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Could not close temporary folder: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9178,50 +9365,52 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Could not close temporary folder: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
-msgid "SASL `%s' Login failed: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9245,35 +9434,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -9381,41 +9570,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9423,89 +9611,88 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO request timed out: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:913
+msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9513,86 +9700,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -9610,188 +9797,195 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr ""
 
 #.
-#. * From:
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
+#: composer/e-msg-composer-hdrs.c:378
+msgid "Reply-To:"
 msgstr ""
 
 #.
-#. * Reply-To:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:376
-msgid "Reply-To:"
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
 msgstr ""
 
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Could not close temporary folder: %s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr ""
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr ""
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -9854,19 +10048,18 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -9964,242 +10157,261 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:80
-msgid "years"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "month"
+#: filter/filter-datespec.c:71
+msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "months"
+#: filter/filter-datespec.c:72
+msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr ""
-
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#: filter/filter-datespec.c:75
+msgid "month"
 msgstr ""
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
+#: filter/filter-datespec.c:76
+msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%m/%d/%Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr ""
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Edit Filters"
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 msgstr ""
 
 #: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10225,39 +10437,39 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
+msgid "contains"
 msgstr ""
 
 #: filter/libfilter-i18n.h:8
-msgid "contains"
+msgid "Copy to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:9
-msgid "Copy to Folder"
+msgid "Date received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:10
-msgid "Date received"
+msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
-msgid "Date sent"
+#: filter/libfilter-i18n.h:12
+msgid "Deleted"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Deleted"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "does not contain"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:15
-msgid "does not end with"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "does not exist"
+msgid "does not return"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
@@ -10281,87 +10493,82 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr ""
 
+#: filter/libfilter-i18n.h:40
+msgid "Pipe Message to Shell Command"
+msgstr ""
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr ""
 
@@ -10377,57 +10584,82 @@ msgstr ""
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+msgid "Shell Command"
+msgstr ""
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr ""
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+msgid "Unset Status"
+msgstr ""
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr ""
 
@@ -10435,11 +10667,11 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr ""
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10447,31 +10679,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr ""
 
@@ -10528,38 +10760,38 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronising folders"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10633,11 +10865,11 @@ msgstr ""
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -10685,63 +10917,80 @@ msgstr ""
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Can not open message"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+msgid "Compose a new mail message"
+msgstr ""
+
+#: mail/component-factory.c:1006
+msgid "New Message Post"
+msgstr ""
+
+#: mail/component-factory.c:1006
+msgid "_Post Message"
+msgstr ""
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Can not open message"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail config component."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's folder info component."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -10790,125 +11039,125 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr ""
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -10968,74 +11217,65 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr ""
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11044,30 +11284,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11075,7 +11315,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11083,131 +11323,127 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11215,35 +11451,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11263,7 +11499,7 @@ msgstr ""
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr ""
 
@@ -11282,15 +11518,14 @@ msgstr ""
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11300,56 +11535,33 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-msgid "Work"
-msgstr ""
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr ""
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -11582,401 +11794,385 @@ msgstr ""
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr ""
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 msgid "Receiving _Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+msgid "Restore Defaults"
+msgstr ""
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12000,223 +12196,232 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
+#: mail/mail-display.c:430
+msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+msgid "Downloading images"
+msgstr ""
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1736
-msgid "View messages..."
-msgstr ""
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12224,145 +12429,140 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr ""
 
@@ -12417,32 +12617,40 @@ msgstr ""
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr ""
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr ""
 
@@ -12466,7 +12674,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr ""
 
@@ -12494,7 +12702,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr ""
 
@@ -12508,7 +12716,7 @@ msgstr ""
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12517,94 +12725,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr ""
 
@@ -12637,43 +12848,43 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr ""
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -12697,16 +12908,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -17183,11 +17394,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -22609,8 +22820,8 @@ msgstr ""
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr ""
 
@@ -22628,15 +22839,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -22648,24 +22859,24 @@ msgstr ""
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr ""
 
@@ -23937,7 +24148,7 @@ msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+msgid "Weather Settings"
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:18
@@ -23993,7 +24204,7 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24004,20 +24215,20 @@ msgstr "Can not get folder: %s: %s"
 msgid "Add a Folder"
 msgstr ""
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr ""
 
@@ -24215,20 +24426,14 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
+msgid "Create New Folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr ""
 
@@ -24245,7 +24450,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -24270,103 +24475,99 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr ""
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr ""
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -24411,8 +24612,13 @@ msgstr "Synchronising folders"
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Could not close temporary folder: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+msgid "Cannot find the specified shared folder."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
@@ -24427,8 +24633,8 @@ msgstr "Cannot initialise Evolution's Mail Wizard interface"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr ""
@@ -24470,54 +24676,54 @@ msgstr ""
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24525,12 +24731,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24538,138 +24744,146 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+msgid "Create _Default Shortcuts"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:275
+msgid "Create Default Shortcuts"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr ""
 
@@ -24677,55 +24891,55 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Can not create folder lock on %s: %s"
@@ -24770,63 +24984,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -24850,6 +25064,23 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Other Organiser"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr ""
@@ -24862,6 +25093,30 @@ msgstr ""
 msgid "Specify where to create the folder:"
 msgstr ""
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_Folder Name:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+msgid "_Server:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+msgid "_User:"
+msgstr ""
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -24946,15 +25201,15 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -24974,50 +25229,50 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Can not initialise the Bonobo component system."
 
@@ -25052,113 +25307,107 @@ msgstr ""
 msgid "Copy to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -25202,11 +25451,6 @@ msgstr ""
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr ""
@@ -25239,7 +25483,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr ""
 
@@ -25252,7 +25496,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -25264,8 +25508,8 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr ""
 
@@ -25290,9 +25534,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr ""
 
@@ -25302,7 +25546,7 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr ""
 
@@ -25316,8 +25560,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr ""
 
@@ -25414,26 +25658,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Can not open message"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Can not append message to maildir folder: %s: %s"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -25530,7 +25784,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr ""
 
@@ -25775,174 +26029,187 @@ msgid "P_revious Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Pr_evious Important Message"
+msgid "Post a Reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "You can not copy messages from this rubbish bin."
+
+#: ui/evolution-mail-message.xml.h:64
+msgid "Pr_evious Important Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Resend..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr ""
 
@@ -25970,169 +26237,157 @@ msgstr ""
 msgid "For_mat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send this message"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save the current file and close the window"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:16
+msgid "_Signature editor"
+msgstr ""
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -26226,167 +26481,191 @@ msgid "Add to _Shortcut Bar"
 msgstr ""
 
 #: ui/evolution.xml.h:3
+msgid "Change Evolution's settings"
+msgstr ""
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 msgid "Open Other _User's Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+msgid "Pi_lot Settings..."
+msgstr ""
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+msgid "_Folder..."
+msgstr ""
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
+#: ui/evolution.xml.h:56
+msgid "_Preferences..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
+#: ui/evolution.xml.h:59
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:55
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:60
+msgid "_Shortcut..."
 msgstr ""
 
 #: ui/my-evolution.xml.h:3
@@ -26402,15 +26681,31 @@ msgid "Reload the view"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
+msgid "By _Company"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
+msgid "_Address Cards"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+msgid "_Phone List"
+msgstr ""
+
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:3
+msgid "_Month View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:4
+msgid "_Work Week View"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
@@ -26437,13 +26732,17 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#: views/tasks/galview.xml.h:1
+msgid "With _Category"
+msgstr ""
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
+msgid "_Tasks"
 msgstr ""
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -26592,11 +26891,11 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr ""
 
@@ -26633,19 +26932,19 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr ""
 
@@ -26659,15 +26958,15 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Could not initialise GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Could not initialise GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index c163808dd5..1e42132130 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: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr ""
@@ -344,45 +344,45 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr ""
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr ""
 
@@ -475,11 +475,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr ""
 
@@ -495,21 +495,28 @@ msgstr ""
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
+#: addressbook/gui/component/addressbook-component.c:565
+msgid "Create a new contact"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-config.c:197
@@ -528,24 +535,24 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Could not initialise Bonobo"
@@ -555,18 +562,18 @@ msgstr "Could not initialise Bonobo"
 msgid "Other Contacts"
 msgstr "Organisation:"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -574,48 +581,48 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -732,7 +739,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr ""
@@ -819,8 +826,8 @@ msgstr "Cannot initialise the Evolution shell."
 msgid "Mappings"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr ""
 
@@ -870,8 +877,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr ""
 
@@ -1056,15 +1063,15 @@ msgid "Using email address"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr ""
 
@@ -1105,12 +1112,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr ""
@@ -1215,10 +1222,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr ""
 
@@ -1247,30 +1254,12 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:544
+msgid "Find contact in"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -1292,14 +1281,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr ""
 
@@ -1403,11 +1388,12 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr ""
 
@@ -2640,7 +2626,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr ""
 
@@ -2699,7 +2685,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr ""
 
@@ -2726,21 +2712,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr ""
 
@@ -2748,8 +2734,8 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr ""
 
@@ -2766,7 +2752,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2787,48 +2773,52 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+msgid "Addressbook does not exist"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Synchronising \"%s\""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2836,19 +2826,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr ""
 
@@ -2920,7 +2910,7 @@ msgstr ""
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
@@ -2953,7 +2943,7 @@ msgid "Pilot Settings..."
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
@@ -2962,8 +2952,8 @@ msgid "Send Message to Contact"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr ""
@@ -2983,7 +2973,7 @@ msgid "Move to folder..."
 msgstr "Synchronising \"%s\""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
@@ -2994,20 +2984,20 @@ msgid "Copy"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr ""
 
@@ -3163,7 +3153,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr ""
 
@@ -3254,26 +3244,26 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr ""
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr ""
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
@@ -3400,11 +3390,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3412,13 +3402,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3429,7 +3419,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3459,7 +3449,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3470,7 +3460,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3493,17 +3483,17 @@ msgstr "%m/%d/%Y"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3528,37 +3518,37 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr ""
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3566,56 +3556,55 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr ""
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr ""
 
@@ -3623,12 +3612,12 @@ msgstr ""
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr ""
 
@@ -3636,36 +3625,52 @@ msgstr ""
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr ""
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr ""
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr ""
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
-msgid "New All Day Appointment"
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
-msgid "All _Day Appointment"
+#: calendar/gui/component-factory.c:723
+msgid "New All Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
+#: calendar/gui/component-factory.c:723
+msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
+#: calendar/gui/component-factory.c:724
+msgid "Create a new all-day appointment"
 msgstr ""
 
 #: calendar/gui/control-factory.c:123
@@ -3731,7 +3736,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr ""
 
@@ -3739,11 +3745,13 @@ msgstr ""
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr ""
 
@@ -3871,7 +3879,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -3900,7 +3908,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr ""
 
@@ -4075,7 +4083,7 @@ msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr ""
 
@@ -4115,19 +4123,33 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
@@ -4195,61 +4217,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4448,7 +4470,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4460,7 +4482,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
@@ -4543,7 +4565,7 @@ msgstr ""
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr ""
 
@@ -4564,7 +4586,7 @@ msgstr ""
 msgid "Other Date"
 msgstr "Organisation:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
@@ -4662,20 +4684,26 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Progress"
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+msgid "Progress"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr ""
 
@@ -4689,7 +4717,7 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4758,76 +4786,76 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4836,8 +4864,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr ""
 
@@ -4865,11 +4893,9 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr ""
 
@@ -4908,105 +4934,104 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5047,7 +5072,7 @@ msgstr ""
 msgid "Task Due: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr ""
 
@@ -5056,329 +5081,334 @@ msgstr ""
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Synchronising \"%s\""
@@ -5424,7 +5454,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr ""
 
@@ -5437,57 +5467,52 @@ msgid "Non-Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr ""
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr ""
 
@@ -5577,46 +5602,43 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Synchronising \"%s\""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr ""
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5627,11 +5649,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Synchronising \"%s\""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -5688,51 +5715,56 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Cannot initialise Evolution's mail component."
@@ -5960,9 +5992,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr ""
 
@@ -5991,8 +6022,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr ""
 
@@ -6047,125 +6078,135 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr ""
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7753,73 +7794,81 @@ msgstr "Synchronising \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -7870,7 +7919,7 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7878,45 +7927,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -7924,17 +7973,17 @@ msgid ""
 "%.*s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -7960,22 +8009,22 @@ msgid "Could not lock '%s'"
 msgstr ""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8034,11 +8083,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8158,7 +8211,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8327,26 +8380,123 @@ msgstr "Synchronising \"%s\""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+msgid "Certificate signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+msgid "Error in CRL"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:593
+msgid "Out of memory"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Invalid purpose"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8355,16 +8505,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8379,31 +8541,36 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, c-format
+msgid "Error storing `%s': %s"
+msgstr ""
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Synchronising \"%s\""
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Synchronising \"%s\""
@@ -8411,12 +8578,12 @@ msgstr "Synchronising \"%s\""
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8445,40 +8612,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8487,10 +8654,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -8503,7 +8670,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr ""
 
@@ -8533,7 +8700,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr ""
 
@@ -8541,69 +8708,73 @@ msgstr ""
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, c-format
+msgid "The folder %s no longer exists"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8611,31 +8782,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -8657,7 +8834,9 @@ msgid "Local delivery"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8683,12 +8862,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8699,38 +8878,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -8786,7 +8965,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8822,24 +9001,24 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -8882,35 +9061,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -8925,64 +9104,64 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9128,47 +9307,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr ""
 
@@ -9185,7 +9364,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr ""
 
@@ -9206,6 +9385,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Synchronising \"%s\""
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9215,50 +9399,52 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Synchronising \"%s\""
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Synchronising \"%s\""
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9282,35 +9468,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -9418,41 +9604,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9460,88 +9645,87 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
+#: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO request timed out: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:913
+msgid "HELO response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9549,86 +9733,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -9646,188 +9830,195 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr ""
 
 #.
-#. * From:
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
+#: composer/e-msg-composer-hdrs.c:378
+msgid "Reply-To:"
 msgstr ""
 
 #.
-#. * Reply-To:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:376
-msgid "Reply-To:"
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
 msgstr ""
 
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+msgid "Post To:"
+msgstr ""
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Synchronising \"%s\""
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr ""
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr ""
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr ""
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -9891,19 +10082,18 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10009,242 +10199,261 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr ""
-
-#: filter/filter-datespec.c:80
-msgid "years"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "month"
+#: filter/filter-datespec.c:71
+msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:81
-msgid "months"
+#: filter/filter-datespec.c:72
+msgid "hour"
 msgstr ""
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr ""
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr ""
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr ""
-
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr ""
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#: filter/filter-datespec.c:75
+msgid "month"
 msgstr ""
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
+#: filter/filter-datespec.c:76
+msgid "year"
 msgstr ""
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%m/%d/%Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr ""
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Edit Filters"
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 msgstr ""
 
 #: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10270,42 +10479,41 @@ msgid "Beep"
 msgstr ""
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Colours"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr ""
 
+#: filter/libfilter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
@@ -10327,87 +10535,82 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr ""
 
+#: filter/libfilter-i18n.h:40
+msgid "Pipe Message to Shell Command"
+msgstr ""
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr ""
 
@@ -10423,57 +10626,83 @@ msgstr ""
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Colours"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr ""
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+msgid "Unset Status"
+msgstr ""
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr ""
 
@@ -10481,12 +10710,12 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Synchronising \"%s\""
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10494,31 +10723,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Synchronise \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr ""
 
@@ -10575,39 +10804,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Synchronise \"%s\""
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Synchronising \"%s\""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr ""
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 msgid "Mail Filters"
 msgstr ""
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10689,11 +10918,11 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -10741,64 +10970,81 @@ msgstr ""
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 msgid "Warning: Unsent Messages"
 msgstr ""
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+msgid "Compose a new mail message"
+msgstr ""
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Colours"
+
+#: mail/component-factory.c:1006
+msgid "_Post Message"
+msgstr ""
+
+#: mail/component-factory.c:1007
+msgid "Post a new mail message"
+msgstr ""
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr ""
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr ""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr ""
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -10847,126 +11093,126 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr ""
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Colours"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -11028,74 +11274,65 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr ""
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr ""
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11104,30 +11341,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11135,7 +11372,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11143,131 +11380,127 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11275,35 +11508,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11323,7 +11556,7 @@ msgstr ""
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr ""
 
@@ -11343,15 +11576,14 @@ msgstr ""
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11361,56 +11593,33 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-msgid "Work"
-msgstr ""
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr ""
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr ""
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -11643,403 +11852,388 @@ msgstr ""
 msgid "Loading Images"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr ""
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr ""
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 msgid "Printed Fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr ""
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 msgid "_Default signature:"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr ""
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12063,224 +12257,233 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
+#: mail/mail-display.c:430
+msgid "Save Attachment..."
 msgstr ""
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+msgid "Downloading images"
+msgstr ""
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr ""
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr ""
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr ""
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr ""
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr ""
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr ""
 
-#: mail/mail-format.c:1736
-msgid "View messages..."
-msgstr ""
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12289,146 +12492,141 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr ""
 
@@ -12483,32 +12681,40 @@ msgstr ""
 msgid "Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr ""
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr ""
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr ""
 
@@ -12532,7 +12738,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr ""
 
@@ -12560,7 +12766,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr ""
 
@@ -12574,7 +12780,7 @@ msgstr "Synchronising \"%s\""
 msgid "Updating vfolders for uri: %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12583,96 +12789,99 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr ""
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr ""
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr ""
 
@@ -12705,43 +12914,43 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr ""
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr ""
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -12765,16 +12974,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -17269,11 +17478,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -22709,8 +22918,8 @@ msgstr ""
 msgid "Mail summary"
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr ""
 
@@ -22728,15 +22937,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -22748,24 +22957,24 @@ msgstr ""
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr ""
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr ""
 
@@ -24038,8 +24247,9 @@ msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Synchronising \"%s\""
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -24096,7 +24306,7 @@ msgstr ""
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24108,20 +24318,20 @@ msgstr "Synchronising \"%s\""
 msgid "Add a Folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr ""
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Synchronising \"%s\""
@@ -24326,20 +24536,15 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr ""
 
@@ -24356,7 +24561,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -24382,105 +24587,101 @@ msgstr ""
 msgid "Select importer"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr ""
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 #, fuzzy
 msgid "Select folder"
 msgstr "Synchronising \"%s\""
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -24526,8 +24727,13 @@ msgstr "Synchronising \"%s\""
 msgid "in \"%s\" ..."
 msgstr ""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Synchronising \"%s\""
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+msgid "Cannot find the specified shared folder."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
@@ -24542,8 +24748,8 @@ msgstr "Cannot initialise Evolution's mail storage hash."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Cannot initialise Evolution's mail storage hash."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr ""
@@ -24585,54 +24791,54 @@ msgstr ""
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+msgid "Create New Shortcut"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr ""
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -24640,12 +24846,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -24653,138 +24859,146 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+msgid "Create _Default Shortcuts"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:275
+msgid "Create Default Shortcuts"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr ""
 
@@ -24792,55 +25006,55 @@ msgstr ""
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Synchronising \"%s\""
@@ -24885,64 +25099,64 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Synchronising \"%s\""
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -24966,6 +25180,24 @@ msgstr ""
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Colours"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Organisation:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr ""
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr ""
@@ -24978,6 +25210,30 @@ msgstr ""
 msgid "Specify where to create the folder:"
 msgstr ""
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_Folder Name:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+msgid "_Server:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+msgid "_User:"
+msgstr ""
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -25063,15 +25319,15 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25091,51 +25347,51 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
@@ -25171,113 +25427,107 @@ msgstr ""
 msgid "Copy to Folder..."
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr ""
 
@@ -25321,11 +25571,6 @@ msgstr ""
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr ""
@@ -25358,7 +25603,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
 msgstr "Colours"
@@ -25373,7 +25618,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -25385,8 +25630,8 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr ""
 
@@ -25411,9 +25656,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr ""
 
@@ -25423,7 +25668,7 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr ""
 
@@ -25437,8 +25682,8 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr ""
 
@@ -25535,26 +25780,34 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Show message preview window"
+msgid "Post New Message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:12
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Post a message to a Public folder"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:13
-msgid "Virtual Folder _Editor..."
+msgid "Show message preview window"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:14
+msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:15
-msgid "_Filters..."
+msgid "Virtual Folder _Editor..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:17
-msgid "_Preview Pane"
+msgid "_Filters..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:18
+msgid "_Preview Pane"
+msgstr ""
+
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -25651,7 +25904,7 @@ msgstr ""
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr ""
 
@@ -25896,175 +26149,187 @@ msgid "P_revious Unread Message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:62
-msgid "Pr_evious Important Message"
+msgid "Post a Reply"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Preview the message to be printed"
+msgid "Post a reply to a message message in a Public folder"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:64
+msgid "Pr_evious Important Message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:65
+msgid "Preview the message to be printed"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Resend..."
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr ""
 
@@ -26092,169 +26357,158 @@ msgstr ""
 msgid "For_mat"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
-msgstr ""
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
+msgstr "Synchronising \"%s\""
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save the current file and close the window"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr ""
 
+#: ui/evolution-signature-editor.xml.h:16
+msgid "_Signature editor"
+msgstr ""
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -26348,169 +26602,196 @@ msgid "Add to _Shortcut Bar"
 msgstr ""
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Cannot initialise the Evolution shell."
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "Copy this folder"
 msgstr "Synchronising \"%s\""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 msgid "Open Other _User's Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Cannot initialise the Evolution shell."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Cannot initialise the Evolution shell."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr ""
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "Synchronising \"%s\""
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr ""
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr ""
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
+#: ui/evolution.xml.h:56
+msgid "_Preferences..."
 msgstr ""
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
+#: ui/evolution.xml.h:59
+msgid "_Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:55
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:60
+msgid "_Shortcut..."
 msgstr ""
 
 #: ui/my-evolution.xml.h:3
@@ -26526,15 +26807,31 @@ msgid "Reload the view"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
+msgid "By _Company"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
+msgid "_Address Cards"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+msgid "_Phone List"
+msgstr ""
+
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:3
+msgid "_Month View"
+msgstr ""
+
+#: views/calendar/galview.xml.h:4
+msgid "_Work Week View"
 msgstr ""
 
 #: views/mail/galview.xml.h:1
@@ -26562,13 +26859,17 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#: views/tasks/galview.xml.h:1
+msgid "With _Category"
+msgstr ""
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
+msgid "_Tasks"
 msgstr ""
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -26718,11 +27019,11 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr ""
 
@@ -26759,21 +27060,21 @@ msgstr ""
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "Colours"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr ""
 
@@ -26787,17 +27088,17 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "Could not initialise Bonobo"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
diff --git a/po/es.po b/po/es.po
index 6835e890b4..0c80de301e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1\n"
-"POT-Creation-Date: 2002-07-30 10:28+0200\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-30 13:47+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -355,7 +355,7 @@ msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Buscando..."
 
@@ -368,32 +368,32 @@ msgstr "Cargando..."
 msgid "Error in search expression."
 msgstr "Error buscando la expresi�n."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "A�adiendo tarjeta al servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando tarjeta del servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Reiniciando b�squeda."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Recibiendo los resultados de la b�squeda LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Error eliminando tarjeta"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "No pude analizar la URL `%s'"
@@ -485,11 +485,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1073
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -505,32 +505,32 @@ msgstr "Servidor LDAP"
 msgid "LDAP server containing contact information"
 msgstr "El servidor LDAP contiene informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "Nueva lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "_Lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Crear nueva lista de contactos"
-
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Nuevo contacto"
 
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:585
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Crear nuevo contacto"
 
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Nueva lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "_Lista de contactos"
+
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crear nueva lista de contactos"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -773,7 +773,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Siempre"
@@ -869,7 +869,7 @@ msgstr "Configuraci�n"
 msgid "Mappings"
 msgstr "M�rgenes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
 #: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
@@ -881,8 +881,8 @@ msgid ""
 "(Secure Sockets Layer)\n"
 "and TLS (Transport Layer Security) protocols are used by some servers to "
 "cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses these "
-"protocols."
+"your connection. Ask your system administrator if your LDAP server uses "
+"these protocols."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:41
@@ -924,7 +924,7 @@ msgstr "Rango de b�_squeda: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1709
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
 #: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Buscando"
@@ -1010,17 +1010,18 @@ msgstr "Schema no soportado"
 
 #: addressbook/gui/component/ldap-config.glade.h:71
 msgid ""
-"The first step in configuring an LDAP server is to provide its name, and your "
-"log in\n"
+"The first step in configuring an LDAP server is to provide its name, and "
+"your log in\n"
 "information. Please ask your system administrator if you are unsure of this "
 "information."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
-"The options on this page control how many entries should be included in your\n"
-"searches, and how long a search should take. Ask your system administrator if "
-"you\n"
+"The options on this page control how many entries should be included in "
+"your\n"
+"searches, and how long a search should take. Ask your system administrator "
+"if you\n"
 "need to change these options."
 msgstr ""
 
@@ -1036,8 +1037,8 @@ msgstr ""
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
-"directory tree. A search scope of \"sub\" will include all entries below your "
-"search base.\n"
+"directory tree. A search scope of \"sub\" will include all entries below "
+"your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base."
 msgstr ""
@@ -1054,23 +1055,25 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:87
 msgid ""
-"This is the full name of your ldap server. For example, "
-"\"ldap.mycompany.com\"."
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"\ntoo large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to "
+"be \n"
+"too large will slow down your addressbook."
 msgstr ""
 "Este es el m�ximo n�mero de tarjetas a descargar.  Si pone este n�mero "
 "demasiado alto relentizar� su agenda."
 
 #: addressbook/gui/component/ldap-config.glade.h:90
 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."
+"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 ""
 "Este es el m�todo que usar� evolution para autenticarse.  Note que "
 "configurarlo como \"Direcci�n de Correo\" requiere acceso an�nimo a su "
@@ -1088,8 +1091,9 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:93
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"\nlist of standard ports has been provided. Ask your system administrator\n"
+"This is the port on the LDAP server that Evolution will try to connect to. "
+"A \n"
+"list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 msgstr ""
 
@@ -1121,14 +1125,14 @@ msgid "Using email address"
 msgstr "Usando direcci�n de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:134
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_A�adir"
@@ -1177,7 +1181,7 @@ msgstr "L�mite de _descarga:"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-undo-signal-handlers.c:174
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1296,9 +1300,9 @@ msgstr "Factor�a para la interfaz de selecci�n de nombre de la Agenda"
 # src/nautilus-bookmarks-window.c:198 src/nautilus-window-menus.c:588
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:692
-#: composer/e-msg-composer-attachment-bar.c:521 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:552
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eliminar"
@@ -1328,11 +1332,11 @@ msgstr "(%d no mostrado)"
 msgid "Unnamed Contact"
 msgstr "Contactos sin nombre"
 
-#: addressbook/gui/component/select-names/e-select-names.c:510
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "Seleccionas contactos de la agenda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:547
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "El remitente contiene"
@@ -1466,9 +1470,9 @@ msgstr "Prefiere recibir el correo como _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3644
-#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:8
-#: mail/folder-browser.c:1725 mail/mail-config.glade.h:150
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
@@ -2707,7 +2711,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ocultar direcciones al mandar correo a esta lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -2802,13 +2806,13 @@ msgid "Error getting book view"
 msgstr "Error al configurar el propietario"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�xito"
 
@@ -2816,7 +2820,7 @@ msgstr "�xito"
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
 #: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1123
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2825,7 +2829,7 @@ msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2842,7 +2846,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1187
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2863,52 +2867,57 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "El archivo %s no existe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�Desea guardar los cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Error a�adiendo lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Error a�adiendo tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Error eliminando tarjeta"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Mostrar"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-global-preferences.c:149
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Mostrar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2916,19 +2925,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Mover tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Copiar tarjeta a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Mover tarjetas a"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Copiar tarjetas a"
 
@@ -3095,7 +3104,7 @@ msgid "Delete"
 msgstr "Suprimir"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3602 calendar/gui/e-week-view.c:3486
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista actual"
@@ -3356,20 +3365,20 @@ msgstr "Cita sin t�tulo"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:734
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1705
+#: calendar/gui/calendar-model.c:1707
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:733
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Baja"
 
@@ -3496,11 +3505,11 @@ msgstr "Tiempo de recordatorio (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:674
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "No hay descripci�n disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:734
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3512,13 +3521,13 @@ msgstr ""
 "configurado para enviar un mensaje de correo.  En su lugar\n"
 "Evolution mostrar� un di�logo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:752
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2710
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:757
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3535,7 +3544,7 @@ msgstr ""
 "\n"
 "�Est� seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
@@ -3563,7 +3572,7 @@ msgstr "La descripci�n contiene"
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1098
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "No coincidente"
 
@@ -3596,17 +3605,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3631,37 +3640,37 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1137
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En proceso"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completado"
 
-#: calendar/gui/calendar-model.c:1039
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3672,34 +3681,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1179 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2003
-#: mail/folder-browser.c:1687 mail/mail-account-gui.c:1228
-#: mail/mail-account-gui.c:1646 mail/mail-accounts.c:453
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
 #: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Recurriendo"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Asignado"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "No"
 
@@ -3721,7 +3729,7 @@ msgstr "Vista Mensual"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1065
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3729,12 +3737,12 @@ msgstr "Agenda"
 msgid "Folder containing appointments and events"
 msgstr "Carpeta conteniendo citas y eventos"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:703
 #: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
 #: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1069
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -3742,57 +3750,57 @@ msgstr "Tareas"
 msgid "Folder containing to-do items"
 msgstr "Carpeta que contiene elementos por hacer"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nueva cita"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "Cit_a"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Crear una nueva cita"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Reuni�n"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "Crear una nueva tarea"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nueva cita"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "Cita de todo el _d�a"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear una nueva cita"
 
-#: calendar/gui/component-factory.c:721
-msgid "New appointment"
-msgstr "Nueva cita"
-
-#: calendar/gui/component-factory.c:721
-msgid "_Appointment"
-msgstr "Cit_a"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "Crear una nueva cita"
-
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3852,14 +3860,16 @@ msgid ""
 "This is an email reminder, but Evolution does not yet support this kind of "
 "reminders.  You will not be able to edit the options for this reminder."
 msgstr ""
-"Este es un recordatorio por correo, pero Evolution todav�a no implementa esta "
-"clase de recordatorios.  No podr� editar las opciones de este recordatorio."
+"Este es un recordatorio por correo, pero Evolution todav�a no implementa "
+"esta clase de recordatorios.  No podr� editar las opciones de este "
+"recordatorio."
 
 #: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "d�as"
 
@@ -3867,11 +3877,13 @@ msgstr "d�as"
 msgid "extra times every"
 msgstr "extra tiempo cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
@@ -4385,20 +4397,20 @@ msgstr "Entrada del diario - %s"
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1204
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3857
-#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1149
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1305
-#: calendar/gui/dialogs/comp-editor.c:1329
-#: calendar/gui/dialogs/comp-editor.c:1353
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "�Imposible obtener versi�n actual!"
 
@@ -4696,7 +4708,7 @@ msgstr "en"
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:87
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
@@ -4719,7 +4731,7 @@ msgstr "�ltimo"
 msgid "Other Date"
 msgstr "Otro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "d�a"
 
@@ -4821,7 +4833,7 @@ msgstr "Fecha Completada:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
 msgid "Needs Action"
 msgstr "Necesita acci�n"
 
@@ -4830,7 +4842,7 @@ msgid "Progress"
 msgstr "Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:887
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
@@ -4923,16 +4935,16 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2758
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
 #: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-directory-view.c:2114
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3626
-#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1698
-#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -4940,7 +4952,7 @@ msgstr "_Abrir"
 msgid "_Save as..."
 msgstr "_Guardar como..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3628
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
 #: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
@@ -4948,21 +4960,21 @@ msgstr "_Guardar como..."
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
 #: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3634
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
 #: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3597
-#: calendar/gui/e-day-view.c:3635 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
 #: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
@@ -4992,7 +5004,7 @@ msgstr "_Marcar tareas como completas"
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7497
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
 #: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Actualizando objetos"
@@ -5037,7 +5049,7 @@ msgstr "Fecha de Inicio"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:51 shell/e-shell.c:740
-#: shell/e-shortcuts.c:1057
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Resumen"
 
@@ -5103,84 +5115,84 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3581
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nueva cit_a"
 
-#: calendar/gui/e-day-view.c:3583 calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nuevo _evento para todo el d�a"
 
-#: calendar/gui/e-day-view.c:3585 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nueva reuni�n"
 
-#: calendar/gui/e-day-view.c:3587 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Nueva tarea"
 
-#: calendar/gui/e-day-view.c:3592 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3488
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-day-view.c:3606 calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la informaci�n de disponibilidad"
 
-#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Configurar..."
 
-#: calendar/gui/e-day-view.c:3618 calendar/gui/e-week-view.c:3498
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configurar"
 
-#: calendar/gui/e-day-view.c:3627 calendar/gui/e-week-view.c:3505
-#: mail/folder-browser.c:1700 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
-#: calendar/gui/e-day-view.c:3639 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Concertar un _encuentro"
 
-#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta ocurrencia _movible"
 
-#: calendar/gui/e-day-view.c:3646 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocurrencia"
 
-#: calendar/gui/e-day-view.c:3647 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las ocurrencias"
 
-#: calendar/gui/e-day-view.c:4009 calendar/gui/e-week-view.c:3882
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
 #: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Las utilidades GNOME Pilot no aparecen instaladas en este sistema."
 
-#: calendar/gui/e-day-view.c:4015 calendar/gui/e-week-view.c:3888
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
 #: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
@@ -5259,31 +5271,31 @@ msgid "Status:"
 msgstr "E_stado:"
 
 #: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Aceptar tentativamente"
 
 #: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rechazado"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-file.c:2936
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1230 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:849 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconocido"
@@ -5331,248 +5343,248 @@ msgstr "Enviar �ltima informaci�n"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # libnautilus-private/nautilus-program-chooser.c:1262
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1124
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado informaci�n de reuniones."
 
-#: calendar/gui/e-itip-control.c:1125
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informaci�n  de reuniones"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reuni�n."
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Propuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reuni�n existente."
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la �ltima actualizaci�n de la reuni�n."
 
-#: calendar/gui/e-itip-control.c:1140
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Petici�n de actualizaci�n de la reuni�n"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la petici�n de reuni�n."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Respuesta de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reuni�n."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n de reuni�n"
 
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1246
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reuni�n err�neo"
 
-#: calendar/gui/e-itip-control.c:1196
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la informaci�n de la tarea."
 
-#: calendar/gui/e-itip-control.c:1197
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> te pide que realices una tarea."
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea a�adir a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1207
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la �ltima informaci�n de la tarea."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Petici�n de actualizaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignaci�n de tarea."
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de tarea"
 
-#: calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea err�neo"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la informaci�n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su informaci�n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Petici�n de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una petici�n de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad err�neo"
 
-#: calendar/gui/e-itip-control.c:1361
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La carpeta parece estar corrompida e irrecuperable."
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje solo contiene peticiones no soportadas."
 
-#: calendar/gui/e-itip-control.c:1408 calendar/gui/e-itip-control.c:1414
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un calendario de mensaje v�lido"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: calendar/gui/e-itip-control.c:1574 calendar/gui/e-itip-control.c:1666
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1577 calendar/gui/e-itip-control.c:1669
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Lo siento, pero hubo un error al leer %s."
 
-#: calendar/gui/e-itip-control.c:1580 calendar/gui/e-itip-control.c:1672
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1675
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1586
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "�El archivo del calendario no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1618 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1639
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1651
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "�El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inv�lido!\n"
 
-#: calendar/gui/e-itip-control.c:1678
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1681
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "�El estado de asistencia no pudo ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1716
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Borrado completo"
 
-#: calendar/gui/e-itip-control.c:1746 calendar/gui/e-itip-control.c:1796
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1748 calendar/gui/e-itip-control.c:1800
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "�El elemento no puedo ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar carpeta"
 
-#: calendar/gui/e-itip-control.c:1910
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar carpeta"
@@ -5618,7 +5630,7 @@ msgstr "fecha de inicio"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
@@ -5631,52 +5643,52 @@ msgid "Non-Participants"
 msgstr "No participan"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Habitaci�n"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Silla"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Participantes requeridos"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Participantes opcional"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5766,36 +5778,37 @@ msgstr "Hora de _inicio de la reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora de _fin de la reuni�n:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tarea en %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El m�todo necesario para cargar `%s' no est� implementado"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "No puedo abrir la carpeta en `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr "Completando tareas..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Comprimiendo carpeta"
@@ -5814,11 +5827,16 @@ msgstr "No puedo abrir la carpeta en `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "El m�todo necesario para abrir `%s' no est� implementado"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo calendario en %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Abriendo carpeta %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -5875,48 +5893,48 @@ msgstr "Octubre"
 msgid "September"
 msgstr "Septiembre"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Es necesario por lo menos un asistente"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Debe especificar un organizador."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Informaci�n del evento"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informaci�n de la tarea"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informaci�n de la entrada de diario"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Informaci�n de disponibilidad"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informaci�n del calendario"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Actualizado"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Regenerar la lista"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Debes participar en el evento."
 
@@ -6152,7 +6170,7 @@ msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2998
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Vista previa"
@@ -6188,8 +6206,8 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2482
-#: mail/mail-callbacks.c:2724
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
@@ -6215,8 +6233,8 @@ msgid ""
 msgstr ""
 "Evolution ha intentado tomar las tareas que estaban en su carpeta de "
 "calendario y migrarlas autom�ticamente a la nueva carpeta de tareas.\n"
-"Algunas tareas no han podido ser migradas, as� que este proceso puede que sea "
-"reintentado otra vez en el futuro."
+"Algunas tareas no han podido ser migradas, as� que este proceso puede que "
+"sea reintentado otra vez en el futuro."
 
 #: calendar/gui/tasks-migrate.c:120
 #, c-format
@@ -6224,14 +6242,14 @@ msgid ""
 "Could not open `%s'; no items from the calendar folder will be migrated to "
 "the tasks folder."
 msgstr ""
-"No pude abrir `%s'; no se migrar�n elementos de la carpeta de calendario a la "
-"carpeta de tareas."
+"No pude abrir `%s'; no se migrar�n elementos de la carpeta de calendario a "
+"la carpeta de tareas."
 
 #: calendar/gui/tasks-migrate.c:133
 #, c-format
 msgid ""
-"The method required to load `%s' is not supported; no items from the calendar "
-"folder will be migrated to the tasks folder."
+"The method required to load `%s' is not supported; no items from the "
+"calendar folder will be migrated to the tasks folder."
 msgstr ""
 "El m�todo requerido para cargar `%s' no est� implementado. No se migrar�n "
 "elementos de la carpeta de calendario a la carpeta de tareas."
@@ -6290,111 +6308,111 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Agenda"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "el argumento 1 de make-time debe ser una cadena tipo ISO 8601 hora/fecha"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que el argumento 2 sea un entero"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que el argumento 2 sea time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que el argumento 1 sea una cadena"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que el argumento 2 sea una cadena"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", "
-"\"description\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
+"\""
 msgstr ""
 "contains? espera que el argumento 1 sea �any�, �summary� � �description�"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera al menos 1 argumento"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
-"has-categories? espera que todos los argumentos sean cadenas o que uno y solo "
-"un argumento sea un booleano falso (#f)"
+"has-categories? espera que todos los argumentos sean cadenas o que uno y "
+"solo un argumento sea un booleano falso (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "�esta completo? espera 0 argumentos"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before espera 1 argumentos"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before espera que el argumento 1 sea time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La evaluaci�n de la expresi�n de b�squeda no ha devuelto un valor booleano"
@@ -8371,8 +8389,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"Esta opci�n conectar� con el servidor usando una clave segura CRAM-MD5, si el "
-"servidor lo implementa."
+"Esta opci�n conectar� con el servidor usando una clave segura CRAM-MD5, si "
+"el servidor lo implementa."
 
 #: camel/camel-sasl-digest-md5.c:43
 msgid "DIGEST-MD5"
@@ -8380,8 +8398,8 @@ msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:45
 msgid ""
-"This option will connect to the server using a secure DIGEST-MD5 password, if "
-"the server supports it."
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
 msgstr ""
 "Esta opci�n conectar� con el servidor usando una clave segura DIGEST-MD5, si "
 "el servidor lo implementa."
@@ -8417,8 +8435,7 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:42
-msgid ""
-"This option will connect to the server using Kerberos 4 authentication."
+msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr "Esta opci�n conectar� con el servidor usando autenticaci�n Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:161
@@ -8431,7 +8448,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:847
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticaci�n err�nea desde el servidor."
 
@@ -8604,33 +8621,134 @@ msgstr "No puedo obtener la carpeta: Operaci�n no v�lida"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No puedo crear la carpeta: Operaci�n no v�lida"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Error al verificar el certificado."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Responsable: %s\n"
-"Asunto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Error al verificar el certificado."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Certificado err�neo de %s:\n"
-"\n"
-"%s\n"
-"\n"
-"�Quieres aceptarlo de todos modos?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Archivo de firma:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID del _certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Error cargando %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Fuera de la oficina"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Error al verificar el certificado."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID del _certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argumento inv�lido"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID del _certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID del _certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8639,16 +8757,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "BAD"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Certificado err�neo de %s:\n"
+"\n"
+"%s\n"
+"\n"
+"�Quieres aceptarlo de todos modos?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8706,12 +8841,12 @@ msgstr "No pude cambiarle el nombre a la carpeta: %s: No existe"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2295
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2298
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconect� inesperadamente: %s"
@@ -8740,40 +8875,40 @@ msgstr "La respuesta del servidor IMAP no conten�a informaci�n de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente ha respondido OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:235
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:301
+#: camel/providers/imap/camel-imap-folder.c:304
 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:526
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Este mensaje no est� disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2043
-#: camel/providers/imap/camel-imap-folder.c:2120
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo informaci�n de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2049
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Buscando mensajes nuevos"
 
-#: camel/providers/imap/camel-imap-folder.c:2417
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -8834,77 +8969,81 @@ msgid "Password"
 msgstr "Contrase�a"
 
 #: camel/providers/imap/camel-imap-provider.c:82
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Conectar� con el servidor IMAP usando una contrase�a de texto plano"
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s servicio para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "No pude conectar con el servidor POP.\n"
 "Error al enviar la contrase�a: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci�n no implementada"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Fallo en la autenticaci�n."
 
-#: camel/providers/imap/camel-imap-store.c:870
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Esta carpeta no est� vac�a"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no implementa el m�todo de autenticaci�n requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:880
+#: camel/providers/imap/camel-imap-store.c:1035
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "El tipo de autenticaci�n %s no est� implementado"
 
-#: camel/providers/imap/camel-imap-store.c:904
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor escriba la contrase�a IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:919
+#: camel/providers/imap/camel-imap-store.c:1074
 #: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "No escribi� una clave."
 
-#: camel/providers/imap/camel-imap-store.c:948
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8915,31 +9054,38 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imap/camel-imap-store.c:1398
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1670
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+"El nombre de la carpeta no puede contener el car�cter de retorno de carro."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No est� permitido que la carpeta ra�z contenga subcarpetas"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "No puedo abrir el buz�n: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9024,7 +9170,7 @@ msgstr "Los almacenes locales no tienen una carpeta de entrada"
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
@@ -9138,21 +9284,21 @@ msgstr "no es un directorio tipo maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "No pude analizar la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "No puedo abrir el maildir en esta ruta: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Comprobando la consistencia de la carpeta"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
 #: camel/providers/local/camel-mbox-summary.c:583
 #: camel/providers/local/camel-mbox-summary.c:673
@@ -9456,47 +9602,47 @@ msgstr "Usar cancelar"
 msgid "Operation failed: %s"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Obteniendo resumen POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Usuario cancelado"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Eliminando los mensajes borrados"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hay mensajes con uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "No puedo obtener mensaje %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaciones indeterminadas"
@@ -9533,12 +9679,12 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-provider.c:81
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
-"Esta opci�n es para conectar con servidores POP usando una contrase�a cifrada "
-"por medio del protocolo APOP. Esto no funcionar� para todos los usuarios ni "
-"siquiera en servidores que dicen implementarlo."
+"Esta opci�n es para conectar con servidores POP usando una contrase�a "
+"cifrada por medio del protocolo APOP. Esto no funcionar� para todos los "
+"usuarios ni siquiera en servidores que dicen implementarlo."
 
 #: camel/providers/pop3/camel-pop3-store.c:183
 #, fuzzy, c-format
@@ -9634,31 +9780,31 @@ msgstr "No pude comunicar con sendmail: %s: correo no enviado"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "No pude hacer un fork a sendmail: %s: correo no enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "No pude enviar mensaje: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail finalizo con %s: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "No pude ejecutar %s: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail finalizo con estado %d: correo no enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "Env�o de correo v�a el programa sendmail"
 
@@ -9836,7 +9982,7 @@ msgstr "Env�o de correo SMTP v�a %s"
 msgid "Cannot send message: sender address not valid."
 msgstr "No puedo enviar el mensaje: direcci�n del remitente no v�lida."
 
-#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -9951,54 +10097,54 @@ msgstr "Expir� el tiempo para AUTH: %s"
 msgid "QUIT response error"
 msgstr "Respuesta de error a RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:377 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:522
+#: composer/e-msg-composer-attachment-bar.c:523
 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:553
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:554
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No puedo adjuntar el archivo %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No puedo adjuntar el archivo %s: no es un archivo normal"
@@ -10016,7 +10162,7 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos autom�ticamente"
 
@@ -10089,7 +10235,7 @@ msgstr ""
 msgid "Post To:"
 msgstr "Porto"
 
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
@@ -10108,34 +10254,34 @@ msgstr ""
 "Error cargando el archivo: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:1162
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "El archivo existe, �Sobreescribir?"
 
-#: composer/e-msg-composer.c:1184
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:1204
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:1237
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Error accediendo al archivo: %s"
 
-#: composer/e-msg-composer.c:1245
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "No pude obtener los mensajes del editor"
 
-#: composer/e-msg-composer.c:1252
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10144,7 +10290,7 @@ msgstr ""
 "No pude buscar en el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10153,7 +10299,7 @@ msgstr ""
 "No pude truncar el archivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1268
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10162,7 +10308,7 @@ msgstr ""
 "Error auto guardando el mensaje: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1368
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10170,7 +10316,7 @@ msgstr ""
 "Ximian Evolution ha encontrado archivos no guardados de una sesi�n previa.\n"
 "�Quiere tratar de recuperarlos?"
 
-#: composer/e-msg-composer.c:1517
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10180,38 +10326,38 @@ msgstr ""
 "\n"
 "�Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:1524
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
-#: composer/e-msg-composer.c:1554
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1926
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1963
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr "Firma"
 
-#: composer/e-msg-composer.c:2004 mail/mail-account-gui.c:1229
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2016
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (predeterminada)"
 
-#: composer/e-msg-composer.c:2193 composer/e-msg-composer.c:2798
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:2815
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10219,7 +10365,7 @@ msgstr ""
 "No puedo crear una ventana de composici�n:\n"
 "No puedo activar el control de selecci�n de direcciones."
 
-#: composer/e-msg-composer.c:2841 composer/e-msg-composer.c:2896
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10227,10 +10373,10 @@ msgstr ""
 "No pude crear una ventana de composici�n:\n"
 "No puedo activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:3787
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be "
-"edited.)<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 
 #: composer/evolution-composer.c:376
@@ -10293,8 +10439,8 @@ msgstr "El asunto contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2347
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10404,122 +10550,72 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:81
-msgid "year"
-msgstr "a�o"
-
-#: filter/filter-datespec.c:81
-msgid "years"
-msgstr "a�os"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "segundos"
 
-#: filter/filter-datespec.c:82
-msgid "month"
-msgstr "mes"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuto"
 
-#: filter/filter-datespec.c:82
-msgid "months"
-msgstr "meses"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hora"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:85
-msgid "hour"
-msgstr "hora"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mes"
 
-#: filter/filter-datespec.c:86
-msgid "minute"
-msgstr "minuto"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "meses"
 
-#: filter/filter-datespec.c:87 mail/mail-config.glade.h:185
-msgid "seconds"
-msgstr "segundos"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "a�o"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "a�os"
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Se ha olvidado de elegir una fecha."
 
-#: filter/filter-datespec.c:198
-msgid "You have chosen an invalid date."
-msgstr "Ha elegido una fecha incorrecta."
-
-#: filter/filter-datespec.c:283
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La fecha del mensaje ser� comparada con la\n"
-"fecha del momento de ejecutar el filtro o\n"
-"cuando se abra el vfolder."
-
-#: filter/filter-datespec.c:306
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La fecha del mensaje ser� comparada con la\n"
-"fecha que especifique aqu�."
-
-#: filter/filter-datespec.c:346
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La fecha del mensaje ser� comparada con una\n"
-"fecha relativa al momento de ejecutar el\n"
-"filtro. Por ejemplo: �Hace una semana�."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:381
-msgid "the current time"
-msgstr "la fecha actual"
-
-#: filter/filter-datespec.c:381
-msgid "a time you specify"
-msgstr "Una fecha a especificar"
-
-#: filter/filter-datespec.c:382
-msgid "a time relative to the current time"
-msgstr "una fecha relativa al momento actual"
-
-#. The dialog
-#: filter/filter-datespec.c:406
-msgid "Select a time to compare against"
-msgstr "Selecciones una hora con la que comparar"
-
-#. The label
-#: filter/filter-datespec.c:440
-msgid "Compare against"
-msgstr "Comparar con"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<pinche aqu� para a�adir una fecha>"
 
-#: filter/filter-datespec.c:558 filter/filter-datespec.c:737
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "ahora"
 
-#: filter/filter-datespec.c:587
-msgid " ago"
-msgstr " hace"
-
-#: filter/filter-datespec.c:633
-msgid "ago"
-msgstr "hace"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:723 mail/message-list.c:1105
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " hace"
 
-#: filter/filter-datespec.c:734
-msgid "<click here to select a date>"
-msgstr "<pinche aqu� para a�adir una fecha>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Selecciones una hora con la que comparar"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
@@ -10555,7 +10651,7 @@ msgstr ""
 "Vuelva y especifique una carpeta v�lida donde entregar el correo."
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1462 mail/mail-account-gui.c:1476
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -10644,42 +10740,91 @@ msgid "outgoing"
 msgstr "saliente"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editar filtros"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editar carpeta virtual"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrando"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La fecha del mensaje ser� comparada con la\n"
+"fecha que especifique aqu�."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La fecha del mensaje ser� comparada con una\n"
+"fecha relativa al momento de ejecutar el\n"
+"filtro. Por ejemplo: �Hace una semana�."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La fecha del mensaje ser� comparada con la\n"
+"fecha que especifique aqu�."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Carpetas virtuales"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "una fecha relativa al momento actual"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "hace"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "solo carpetas especificadas"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "la fecha actual"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "Una fecha a especificar"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Fuentes de la carpeta virtual"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "con todas las carpetas remotas activas"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "con todas las carpetas locales y remotas activas"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "con todas las carpetas locales"
 
@@ -10813,7 +10958,7 @@ msgstr "no es"
 msgid "is not Flagged"
 msgstr "Marcado"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1735
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
@@ -10844,7 +10989,7 @@ msgstr "Ejecutar comando de shell"
 msgid "Play Sound"
 msgstr "Tocar un sonido:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Le�do"
 
@@ -10880,7 +11025,7 @@ msgstr "es menor que"
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1654
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Remitente"
 
@@ -10916,7 +11061,7 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Asunto"
@@ -10925,15 +11070,20 @@ msgstr "Asunto"
 msgid "Unset Status"
 msgstr "Sin estado"
 
-#: filter/rule-editor.c:179
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reglas"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "A�adir Regla"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Editar Regla"
 
@@ -10977,7 +11127,7 @@ msgstr "Guardando %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:318
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Correo"
 
@@ -11043,7 +11193,7 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando su vieja informaci�n de Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1084
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Papelera"
@@ -11211,255 +11361,255 @@ msgstr ""
 "Algunas de tus opciones de correo parece que est�n corruptas, por favor "
 "comprueba que todo est� en orden."
 
-#: mail/component-factory.c:925
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "No ha definido un sistema para enviar el correo"
 
-#: mail/component-factory.c:947
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:953
+#: mail/component-factory.c:956
 msgid "Warning: Unsent Messages"
 msgstr "Aviso: Mensajes no enviados"
 
-#: mail/component-factory.c:995
+#: mail/component-factory.c:997
+msgid "New Mail Message"
+msgstr "Nuevo mensaje de correo"
+
+#: mail/component-factory.c:997
+msgid "_Mail Message"
+msgstr "_Mensaje de correo"
+
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Nuevo mensaje"
+
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "New Message Post"
 msgstr "Siguiente mensaje"
 
-#: mail/component-factory.c:995
+#: mail/component-factory.c:1006
 #, fuzzy
 msgid "_Post Message"
 msgstr "Mensaje previo"
 
-#: mail/component-factory.c:996
+#: mail/component-factory.c:1007
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Nuevo mensaje"
 
-#: mail/component-factory.c:1000
-msgid "New Mail Message"
-msgstr "Nuevo mensaje de correo"
-
-#: mail/component-factory.c:1000 ui/evolution-mail-global.xml.h:19
-msgid "_Mail Message"
-msgstr "_Mensaje de correo"
-
-#: mail/component-factory.c:1001
-#, fuzzy
-msgid "Compose a new mail message"
-msgstr "Nuevo mensaje"
-
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:1038
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "No puedo inicializar el componente de configuraci�n de correo de Evolution."
 
-#: mail/component-factory.c:1044
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "No puedo inicializar el componente de informaci�n sobre carpetas de "
 "Evolution."
 
-#: mail/component-factory.c:1269 mail/component-factory.c:1299
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: mail/component-factory.c:1310
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser-ui.c:431
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades para �%s�"
 
-#: mail/folder-browser-ui.c:433
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:335 mail/mail-display.c:841
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nuevos"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d ocultos"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionado"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/folder-browser.c:1092
+#: mail/folder-browser.c:1091
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una Carpeta _Virtual seg�n el mensaje"
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual seg�n el a_sunto"
 
-#: mail/folder-browser.c:1672
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual seg�n el _remitente"
 
-#: mail/folder-browser.c:1673
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual seg�n los _destinatarios"
 
-#: mail/folder-browser.c:1674
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual seg�n la _Lista de Correo"
 
-#: mail/folder-browser.c:1678
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtrar seg�n el As_unto"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtrar seg�n el Re_mitente"
 
-#: mail/folder-browser.c:1680
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtrar seg�n los Des_tinatarios"
 
-#: mail/folder-browser.c:1681 mail/folder-browser.c:2015
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtrar seg�n la Lista de _Correo"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/folder-browser.c:1705 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Resp. al Remitente"
 
-#: mail/folder-browser.c:1706 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Resp. a la _Lista"
 
-#: mail/folder-browser.c:1707 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "_Nombre completo..."
 
-#: mail/folder-browser.c:1713
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completado"
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "Li_mpiar marca"
 
 #. separator here?
-#: mail/folder-browser.c:1718 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_car como le�do"
 
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _no le�do"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como No Im_portante"
 
-#: mail/folder-browser.c:1726
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: mail/folder-browser.c:1731 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "A�adir Remitente a la Agen_da"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "Apl_icar filtros"
 
-#: mail/folder-browser.c:1747
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear una Reg_la con el Mensaje"
 
-#: mail/folder-browser.c:2016
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Carpeta virtual seg�n la Lista de Correo"
 
-#: mail/folder-browser.c:2018
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar seg�n la lista de correo (%s)"
 
-#: mail/folder-browser.c:2019
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Carpeta virtual seg�n la Lista de Correo (%s)"
@@ -11509,7 +11659,8 @@ msgid ""
 "(such as lack of disk space) may not be automatically\n"
 "recoverable.  Please use this feature with care."
 msgstr ""
-"Nota: Cuando se convierte entre distintos formatos de buz�n de correo, puede\n"
+"Nota: Cuando se convierte entre distintos formatos de buz�n de correo, "
+"puede\n"
 "que un fallo (como la falta de disco) no sea recuperable autom�ticamente.\n"
 "Por favor use esta opci�n con cuidado."
 
@@ -11534,19 +11685,19 @@ msgstr "No ha rellenado toda la informaci�n requerida."
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Nombre de usuario:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: mail/mail-account-gui.c:1842
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "No puedes crear dos cuentas con el mismo nombre."
 
@@ -11593,30 +11744,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "Enviar a %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "A�adir Regla de Filtro"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11628,7 +11779,7 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11640,7 +11791,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "�Querr�a configurarlo ahora?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11648,7 +11799,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11657,7 +11808,7 @@ msgstr ""
 "correo para poder enviarlo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:198
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11665,11 +11816,11 @@ msgstr ""
 "Estas enviando un mensaje formateado en HTML, pero los siguientes "
 "destinatarios no indica que quieran recibir mensajes formateados en HTML:\n"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11677,7 +11828,7 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "�Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11686,11 +11837,11 @@ msgstr ""
 "esconder la lista de direcciones, este mensaje solo contendr� destinatarios "
 "Bcc."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Este mensaje solo contiene destinatarios Bcc."
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11700,11 +11851,11 @@ msgstr ""
 "cabecera Apparently-To.\n"
 "�Enviar de todos modos?"
 
-#: mail/mail-callbacks.c:427
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11712,28 +11863,28 @@ msgstr ""
 "No pude abrir la carpeta de borradores para esta cuenta.\n"
 "�Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-callbacks.c:1052
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%s escribi�:"
 
-#: mail/mail-callbacks.c:1535 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:1537 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:2191
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Esta seguro que quiere editar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2216
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11741,7 +11892,7 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Borradores."
 
-#: mail/mail-callbacks.c:2255
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11749,39 +11900,39 @@ msgstr ""
 "Solo puede reenviar mensajes\n"
 "de la carpeta Enviados."
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Esta seguro que quiere reenviar los %d mensajes?"
 
-#: mail/mail-callbacks.c:2295
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Se hay mensajes seleccionados"
 
-#: mail/mail-callbacks.c:2340 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "�Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:2394
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:2396
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostrar el siguiente mensaje no le�do"
 
-#: mail/mail-callbacks.c:2474
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11793,7 +11944,7 @@ msgstr ""
 "\n"
 "�Borrar realmente esos mensajes?"
 
-#: mail/mail-callbacks.c:2830
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11802,28 +11953,28 @@ msgstr ""
 "Error cargando la informaci�n del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2842
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%ld de %ld"
 
-#: mail/mail-callbacks.c:2939
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:2966
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3005
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresi�n del mensaje"
 
-#: mail/mail-callbacks.c:3193 mail/mail-callbacks.c:3234
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�Esta seguro que quiere abrir %d mensajes en ventanas separadas?"
@@ -11843,7 +11994,7 @@ msgstr " [script]"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2823
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -11863,9 +12014,9 @@ msgstr "A�adir firma"
 #: mail/mail-config-druid.c:146
 #, fuzzy
 msgid ""
-"Please enter your name and email address below. The \"optional\" fields below "
-"do not need to be filled in, unless you wish to include this information in "
-"email you send."
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Por favor escriba debajo su nombre y direcci�n de correo. Los campos  "
 "�opcionales� no hace falta que los rellene,\n"
@@ -11877,8 +12028,8 @@ msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Por favor rellene la informaci�n acerca del servidor de correo de entrada. Si "
-"no est� seguro, preg�ntele a su\n"
+"Por favor rellene la informaci�n acerca del servidor de correo de entrada. "
+"Si no est� seguro, preg�ntele a su\n"
 "administrador de sistemas o a su Proveedor de Servicios de Internet."
 
 #: mail/mail-config-druid.c:150
@@ -11916,16 +12067,16 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Asistente de cuentas de Evolution"
 
-#: mail/mail-config.c:617
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Cuenta %d"
 
-#: mail/mail-config.c:2543
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:2621 mail/mail-config.c:2625
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -12618,204 +12769,213 @@ msgstr "No pude crear un contexto sobre tipo S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "No pude crear un contexto de decodificaci�n S/MIME."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:430
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:393
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (v�a %s)"
 
-#: mail/mail-display.c:457
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-display.c:478
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Cargar _Im�genes"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Cargando el contenido del mensaje"
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tareas fuera de pla_zo:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Abrir enlace en el Navegador"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copiar Direcci�n del enlace"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Guardar enlace como (ARR�GLAME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No puede analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Direcci�n err�nea"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Correo"
 
-#: mail/mail-format.c:1737
-msgid "View messages..."
-msgstr "Ver mensajes..."
-
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Este mensaje est� firmado digitalmente. Pulsa en el icono del candado para "
 "m�s informaci�n."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "No pude crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Este mensaje est� firmado digitalmente y es aut�ntico."
 
-#: mail/mail-format.c:1878
-msgid ""
-"This message is digitally signed but can not be proven to be authentic."
+#: mail/mail-format.c:1852
+msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Este mensaje est� firmado digitalmente pero no se puede verificar su "
 "autenticidad."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en �%s�"
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo �%s�)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Carpetas locales"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando carpeta"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "No puedo guardar la meta informaci�n de la carpeta: probablemente\n"
 "no puedas volver a abrir esta carpeta: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "No puedo guardar la meta informaci�n de la carpeta en %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "No puedo borrar la meta informaci�n de la carpeta %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta �%s� al formato �%s�"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s no puede ser reconfigurado porque no es una carpeta local"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12823,16 +12983,16 @@ msgstr ""
 "Si no puede volver a abrir este buz�n, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "No puede cambiar el formato de una carpeta no local."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12841,7 +13001,7 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12850,7 +13010,7 @@ msgstr ""
 "Error mientras hacia:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Trabajando"
 
@@ -12858,100 +13018,100 @@ msgstr "Trabajando"
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: mail/mail-ops.c:546 mail/mail-ops.c:575
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Aun as�, este mensaje fue enviado correctamente."
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando �%s�"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Error en mensaje %d de %d"
 
-#: mail/mail-ops.c:752 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en �%s�"
 
-#: mail/mail-ops.c:1217
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1332
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo sitio %s"
 
-#: mail/mail-ops.c:1405
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta '%s'"
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: mail/mail-ops.c:1707
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Obteniendo %d mensajes(s)"
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Guardando %d mensaje(s)"
 
-#: mail/mail-ops.c:1905
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12960,7 +13120,7 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1933
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12969,11 +13129,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12982,17 +13142,17 @@ msgstr ""
 "No pude crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-ops.c:2202
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectar de %s"
 
-#: mail/mail-ops.c:2202
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
@@ -13115,7 +13275,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -13127,7 +13287,8 @@ msgstr "Guardar firma"
 #: mail/mail-signature-editor.c:407
 msgid ""
 "If you would like to use an old signature, you may import it by opening the "
-"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" item."
+"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
+"item."
 msgstr ""
 
 #: mail/mail-signature-editor.c:416
@@ -13171,8 +13332,7 @@ msgstr ""
 "    '%s'\n"
 "Y han sido actualizadas."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:747
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -13202,63 +13362,67 @@ msgstr "(Sin asunto)"
 msgid "%s - Message"
 msgstr "%s - Mensaje"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:725
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples mensajes sin leer"
 
-#: mail/message-list.c:726
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "M�ltiples mensajes"
 
-#: mail/message-list.c:730
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "La m�s baja"
 
-#: mail/message-list.c:731
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "M�s baja"
 
-#: mail/message-list.c:735
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "M�s alta"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "La m�s alta"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1085
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1097
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2539
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -13299,26 +13463,26 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Llamada"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Avanzar"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "_Nombre completo..."
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informaci�n de la Fuente"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward"
 msgstr ""
@@ -13326,24 +13490,24 @@ msgstr ""
 "Reenviar#-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#\n"
 "Adelante"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Previsualizaci�n"
 
-#: mail/message-tag-followup.c:319
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Nombre completo..."
@@ -13368,16 +13532,16 @@ msgstr "Suscribiendo a carpeta �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "De-suscribiendo la carpeta �%s�"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Carpeta"
 
-#: mail/subscribe-dialog.c:1516
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ning�n servidor"
 
-#: mail/subscribe-dialog.c:1577
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Por favor seleccione un servidor."
 
@@ -23270,8 +23434,8 @@ msgstr "Sin descripci�n"
 msgid "Mail summary"
 msgstr "Resumen de correo"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:422
-#: my-evolution/e-summary-mail.c:750 shell/e-local-storage.c:1126
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
@@ -23289,15 +23453,15 @@ msgstr "LEMD:LEVS:LEVC"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Palabra del D�a"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Frase del D�a"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "A�adir una fuente de noticias"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Escriba la URL de la fuente de noticias que quiere a�adir"
 
@@ -23309,16 +23473,16 @@ msgstr "Error obteniendo RDF"
 msgid "News Feed"
 msgstr "Fuentes de noticias"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Todo"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "A�adir"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
@@ -24600,7 +24764,8 @@ msgid "Tasks "
 msgstr "Tareas "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Configuraci�n de tiempo"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24675,7 +24840,7 @@ msgid "Drafts"
 msgstr "Borradores"
 
 #: shell/e-local-storage.c:179 shell/e-shell-view.c:397
-#: shell/e-shortcuts.c:1061
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Entrada"
 
@@ -24696,8 +24861,8 @@ msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
-"Esta nueva versi�n de Evolution necesita instalar archivos "
-"adicionales\nen su carpeta personal de Evolution"
+"Esta nueva versi�n de Evolution necesita instalar archivos adicionales\n"
+"en su carpeta personal de Evolution"
 
 #: shell/e-setup.c:131
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
@@ -24947,8 +25112,8 @@ msgid ""
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
 msgstr ""
-"Elija el archivo que quiere importar a Evolution, y seleccione de la lista el "
-"tipo de archivo que es.\n"
+"Elija el archivo que quiere importar a Evolution, y seleccione de la lista "
+"el tipo de archivo que es.\n"
 "\n"
 "Si no lo sabe, puede elegir �Autom�tico� y Evolution tratar� de encargarse."
 
@@ -24999,8 +25164,8 @@ msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
-"No hay ninguna herramienta para importar datos que pueda encargarse "
-"de\n%s"
+"No hay ninguna herramienta para importar datos que pueda encargarse de\n"
+"%s"
 
 #: shell/e-shell-importer.c:524
 msgid "Importing"
@@ -25130,9 +25295,14 @@ msgstr "Abriendo carpeta %s"
 msgid "in \"%s\" ..."
 msgstr "Abrir en %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "No pude cambiar el nombre a la carpeta: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "No puedo crear la carpeta especificada:\n"
 "%s"
@@ -25150,8 +25320,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "No pude iniciar la interfaz del Asistente de Correo de Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuevo"
@@ -25318,89 +25488,99 @@ msgstr "Renombrar Grupo de Atajos"
 msgid "Rename selected shortcut group to:"
 msgstr "Renombrar grupos de atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Icono_s peque�os"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos peque�os"
 
-#: shell/e-shortcuts-view.c:231
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Quitar este Grupo..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Re_nombrar este Grupo..."
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Renombrar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:255
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ocultar la barra de atajos"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Crear un nuevo atajo"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Crear un nuevo atajo"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Renombrar atajo"
 
-#: shell/e-shortcuts-view.c:376
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Renombrar atajos seleccionados a:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir la carpeta enlazada a este atajo"
 
-#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir en una Nueva _Ventana"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Abrir la carpeta asociada a este atajo en una nueva ventana"
 
 # #-#-#-#-#  nautilus-es.po (Nautilus)  #-#-#-#-#
 # src/file-manager/fm-icon-view.c:328
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Renombrar este atajo"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Bo_rrar"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
@@ -25408,7 +25588,7 @@ msgstr "Quitar este atajo de la lista de atajos"
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-shortcuts.c:1053
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Atajos"
 
@@ -25520,63 +25700,63 @@ msgstr ""
 "El error del sistema de activaci�n es:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Error CORBA"
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Interrumpido"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Ya tiene un due�o"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Sin due�o"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "No encontrado"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Tipo no soportado"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Schema no soportado"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Operaci�n no soportada"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Error interno"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Salir"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI no v�lida"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Tiene subcarpetas"
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "No queda sitio"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "El antiguo due�o a muerto"
 
@@ -25945,7 +26125,7 @@ msgstr "la fecha actual"
 #: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
@@ -26238,35 +26418,30 @@ msgstr "Componer un _nuevo mensaje"
 
 #: ui/evolution-mail-global.xml.h:12
 #, fuzzy
-msgid "Post a Message"
-msgstr "%s - Mensaje"
-
-#: ui/evolution-mail-global.xml.h:13
-#, fuzzy
 msgid "Post a message to a Public folder"
 msgstr "Guardando mensajes en la carpeta"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Mostrar ventana de vista previa del mensajes"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o de-suscribirse de carpetas de los servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de carpetas virtuales..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Vista _previa"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Suscribirse a las carpetas..."
 
@@ -27542,7 +27717,7 @@ msgstr "..."
 msgid "Search Editor"
 msgstr "Editor de b�squedas"
 
-#: widgets/misc/e-filter-bar.c:204
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Guardar b�squeda"
 
@@ -27608,19 +27783,45 @@ msgstr "El Servidor de Agendas Personales"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "El Servidor de Calendarios Personales. Factor�a de calendarios"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): no pude inicializar GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): no pude inicializar GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonob(): no pude inicializar Bonobo"
 
 #~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Responsable: %s\n"
+#~ "Asunto: %s"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Ha elegido una fecha incorrecta."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "La fecha del mensaje ser� comparada con la\n"
+#~ "fecha del momento de ejecutar el filtro o\n"
+#~ "cuando se abra el vfolder."
+
+#~ msgid "View messages..."
+#~ msgstr "Ver mensajes..."
+
+#, fuzzy
+#~ msgid "Post a Message"
+#~ msgstr "%s - Mensaje"
+
+#~ msgid ""
 #~ "Evolution is unable to get the addressbook local storage.\n"
 #~ "This may have been caused by the evolution-addressbook component "
 #~ "crashing.\n"
@@ -27898,10 +28099,6 @@ msgstr "init_bonob(): no pude inicializar Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Archivo de firma:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Borrar todas menos la firma"
 
diff --git a/po/et.po b/po/et.po
index 022e4be2c3..8db8c724bc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1.0.2\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-03-08 19:58+0200\n"
 "Last-Translator: T�ivo Leedj�rv <toivo@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -41,7 +41,7 @@ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 msgid "File As"
 msgstr "Fail kui"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
@@ -349,46 +349,46 @@ msgstr "VKaart %s jaoks"
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Otsin..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Laen..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Viga otsingu avaldises."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Lisan kaardi LDAP serverisse..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Eemaldan kaardi LDAP serverist..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Muudan kaarti LDAP serveris..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Alustan otsingut uuesti."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "V�tan vastu LDAP otsingu tulemused..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
@@ -480,11 +480,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -500,23 +500,32 @@ msgstr "LDAP server"
 msgid "LDAP server containing contact information"
 msgstr "Kontaktide infot sisaldav LDAP server"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Uus kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Loob uue kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontaktide _nimekiri"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Uus kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Loob uue kontaktide nimekirja"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -539,29 +548,29 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Ei saa gnome-vfs initsialiseerida"
 
@@ -569,11 +578,11 @@ msgstr "Ei saa gnome-vfs initsialiseerida"
 msgid "Other Contacts"
 msgstr "Teised kontaktid"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Aadressiraamatu avamine eba�nnestus"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -583,7 +592,7 @@ msgstr ""
 "olla see, et sisestasid vale URI v�i kasutatav LDAP server\n"
 "on maas"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -595,7 +604,7 @@ msgstr ""
 "ise Evolution'i l�htetekstidest kokku kompileerima.\n"
 "Eelnevalt laadi OpenLDAP allj�rgneva viida abil.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -603,44 +612,44 @@ msgstr ""
 "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee\n"
 "on �ige ja kas sul on sellele vajalikud ligip��su�igused."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Palun sisesta %s parool (kasutaja %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "l�ppeb"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline v�li sisaldab"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Edasij�udnutele..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, mida kaustalehitseja n�itab"
 
@@ -762,7 +771,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Aadressiraamatu allikas"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -856,8 +865,8 @@ msgstr "H��lestus"
 msgid "Mappings"
 msgstr "Veerised"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_intervalliga:"
@@ -909,8 +918,8 @@ msgstr "Otsi _kehtivuspiirkonnast:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Otsin"
 
@@ -1101,15 +1110,15 @@ msgid "Using email address"
 msgstr "See on e-_postiaadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lisa"
 
@@ -1155,12 +1164,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Redaktor"
@@ -1275,10 +1284,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eemalda"
 
@@ -1307,33 +1316,15 @@ msgstr "(%d n�itamata)"
 msgid "Unnamed Contact"
 msgstr "Nimetu kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Kontaktide valimine aadressiraamatust"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Saatja sisaldab"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Kontaktide valimine aadressiraamatust"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Vali nimed"
@@ -1355,15 +1346,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_T�sta mujale..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "Kate_gooria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Kaust:"
 
@@ -1469,11 +1455,12 @@ msgstr "Soovib saada _HTML s�numeid"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Kustuta"
 
@@ -2712,7 +2699,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Peida aadressid sellesse listi kirja saatmisel"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -2775,7 +2762,7 @@ msgstr ""
 "eksisteerib antud kaustas. Kas sa soovid seda ikka lisada?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Eriotsing"
 
@@ -2803,21 +2790,21 @@ msgid "Error getting book view"
 msgstr "Viga %s k�ivitamisel"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�nnestus"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
@@ -2825,8 +2812,8 @@ msgstr "Tundmatu viga"
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Juurdep��s keelatud"
 
@@ -2843,7 +2830,7 @@ msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2866,48 +2853,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Faili %s ei leitud."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Kas soovid muudatused salvestada?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Viga kaardi lisamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Viga kaardi eemaldamisel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Kuva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Kuva"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2915,22 +2907,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kaardid puuduvad"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Kaardid puuduvad"
@@ -3003,7 +2995,7 @@ msgstr "Aadressiraamat"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvesta VKaardina"
 
@@ -3043,7 +3035,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot'i s�tted"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Saada kontakt edasi"
 
@@ -3052,8 +3044,8 @@ msgid "Send Message to Contact"
 msgstr "Saada kontaktile s�num"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tr�ki"
@@ -3073,7 +3065,7 @@ msgid "Move to folder..."
 msgstr "_T�sta kausta..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "L�ika"
 
@@ -3084,20 +3076,20 @@ msgid "Copy"
 msgstr "Kopeeri"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Kustuta"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "K�e_solev vaade"
@@ -3266,7 +3258,7 @@ msgstr "Veerised"
 msgid "Number of columns:"
 msgstr "Tulpade arv:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "H��lestus"
 
@@ -3356,26 +3348,26 @@ msgstr "Nimetu s�ndmus"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "K�rge"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Madal"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "M��ramata"
@@ -3498,11 +3490,11 @@ msgstr "Easil�kkamise aeg (minutites)"
 msgid "_Edit appointment"
 msgstr "_Muuda kohtumist"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3514,13 +3506,13 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3537,7 +3529,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi k�ivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Seda k�simust rohkem mitte esitada."
@@ -3566,7 +3558,7 @@ msgstr "Kirjeldus sisaldab"
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -3577,7 +3569,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -3599,17 +3591,17 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalendrivaate loomine nurjus. Kontrolli ORBit'i ja OAF'i seadistusi."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Salajane"
@@ -3634,37 +3626,37 @@ msgstr "Ida"
 msgid "W"
 msgstr "L�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vaba"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Kinni"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Pole alanud"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "T��s"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "L�petatud"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3675,56 +3667,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "M��ratud"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "P�eva vaade"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "T��n�dala vaade"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "N�dala vaade"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Kuu vaade"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3732,12 +3723,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Kohtumisi ja s�ndmusi sisaldav kaust"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�lesanded"
 
@@ -3745,44 +3736,62 @@ msgstr "�lesanded"
 msgid "Folder containing to-do items"
 msgstr "�lesandeid sisaldav kaust"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Uus s�ndmus"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "S�ndmus"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Lisab uue s�ndmuse"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Uudistekanalite seadistused"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Lisab uue �lesande"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_�lesanne"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Lisab uue �lesande"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uus s�ndmus"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Uus s�ndmus"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "S�ndmus"
+msgid "Create a new all-day appointment"
+msgstr "Lisab uue s�ndmuse"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3849,7 +3858,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "p�eva"
 
@@ -3857,11 +3867,13 @@ msgstr "p�eva"
 msgid "extra times every"
 msgstr "korda, vahemikuga"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutit"
 
@@ -3989,7 +4001,7 @@ msgstr "Meeldetuletajad"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuv�te:"
 
@@ -4018,7 +4030,7 @@ msgstr "s�ndmuse l�ppu"
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuti(t)"
 
@@ -4196,7 +4208,7 @@ msgid "_Fri"
 msgstr "_R"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_�ldine"
 
@@ -4241,19 +4253,33 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne s�ndmuse algust"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Kohtumise staatus on muutunud. Saata uuendatud versioon?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud kohtumise?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud �lesande?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Kas sa t�esti soovid katkestada ja kustutada antud p�eviku sissekande?"
 
@@ -4324,61 +4350,61 @@ msgstr " (T�htaeg "
 msgid "Due "
 msgstr "T�htaeg "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ei saanud uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Muuda s�ndmust"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "S�ndmus - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�lesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "P�eviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Kokkuv�te puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4577,7 +4603,7 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4589,7 +4615,7 @@ msgstr "Roll"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -4674,7 +4700,7 @@ msgstr "j�rgnevatel n�dalap�evadel:"
 msgid "first"
 msgstr "nimekiri"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
@@ -4698,7 +4724,7 @@ msgstr "nimekiri"
 msgid "Other Date"
 msgstr "Muu faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "kuup�ev"
 
@@ -4799,20 +4825,26 @@ msgstr "valmis (%)"
 msgid "Date Completed:"
 msgstr "L�petamise p�ev:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Vajab tegevust"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Edenemine"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "T�_htsus:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Olek:"
 
@@ -4826,7 +4858,7 @@ msgstr "P�hiline"
 msgid "Assignment"
 msgstr "Kellele m��ratud"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4895,80 +4927,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "A_va"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tr�ki..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_L�ika"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "M��ra �lesanne"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_M�rgi l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_M�rgi �lesanded l�petatuks"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud �lesanded"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�lesande lisamiseks vajuta siia"
@@ -4977,8 +5009,8 @@ msgstr "�lesande lisamiseks vajuta siia"
 msgid "Alarms"
 msgstr "Alarmid"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "L�petatud"
 
@@ -5006,11 +5038,9 @@ msgstr "T�htsus"
 msgid "Start Date"
 msgstr "Algab kuup�eval"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kokkuv�te"
 
@@ -5052,110 +5082,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pl"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Uus _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Uus kogu p�eva _s�ndmus"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Kohtumine"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Uus �lesanne"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tr�ki"
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mine t�nasele _p�evale"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Mine kuup�evale..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/h�ivatud infot"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "H��lestus"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "H��lestus"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta kohtumine"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "M�rgi see s�ndmus _nihutatavaks"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see s�ndmus"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_�ik s�ndmused"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse s�steemi paigaldatud olevat."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s k�ivitamisel."
@@ -5196,7 +5225,7 @@ msgstr "Valmis: <b>"
 msgid "Task Due: <b>"
 msgstr "�lesande t�htaeg: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
@@ -5205,12 +5234,12 @@ msgstr "iKalendri informatsioon"
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5218,328 +5247,333 @@ msgstr ""
 "<br> Palun vaata j�rgnev info �le ja vali allpool olevast men��st endale "
 "sobilik tegevus."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "As_ukoht:"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Olek:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Vastu v�etud"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Tagasi l�katud"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "N�ustu"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Proovin�usolek"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "L�kka tagasi"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Vaba/h�ivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Saadab v�rskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "T�hista"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publitseeris kohtumise info."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Kohtumise info"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib saada sinu kohalolekut kohtumisel."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Ettepanek kohtumiseks"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Kohtumise info uuendus"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot kohtumise kohta."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Soov muuta kohtumist"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas kohtumise p�ringule."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Kohtumise vastus"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Kokkusaamise t�histamine"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> t�histas kohtumise."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Vigane kohtmise s�num"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas �lesande info."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "�lesande info"
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa t�idaksid �lesande."
 
 # !PARANDA!
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Ettepanek �lesandeks"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "�lesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada v�rskeimat infot �lesande kohta."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Soov muuta �lesannet"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas �lesande m��ramisele."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "�lesande vastus"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas �lesande."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "�lesande t�histamine"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Vigane �lesande s�num"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/h�ivatud info."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Vaba/h�ivatud info"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/h�ivatud infot."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/h�ivatud infot"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/h�ivatud p�ringule."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Vaba/h�ivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/h�ivatud s�num"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "S�num sisaldab ainult toetamata p�ringuid."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Uuendamine l�petatud\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendrifaili ei saa uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Osav�tja olekut ei olnud v�imailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Osav�tja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Osav�tja olekut ei ole v�imailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Eemaldamine l�petatud"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine eba�nnestus!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vali kaust"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vali kaust"
@@ -5585,7 +5619,7 @@ msgstr "alguskuup."
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
@@ -5598,57 +5632,52 @@ msgid "Non-Participants"
 msgstr "Mitteosalejad"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuaalne"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupp"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressurss"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Ruum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Juht"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "N�utav osaleja"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "V�imalik osav�tja"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Vajab tegevust"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Katseline"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegeeritud"
 
@@ -5739,49 +5768,46 @@ msgstr "Kohtumise _algus:"
 msgid "Meeting _end time:"
 msgstr "Kohtumise l_�pp:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s �lesanded"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ei saa laadida '%s' �lesandeid"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ei saa avada '%s' kausta"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "L�petamise kuup�ev"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "T�hjendan kausta"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Uus _s�ndmus..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "K_ustuta valitud s�ndmus"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5792,11 +5818,16 @@ msgstr "Ei saa avada '%s' kausta"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' avamiseks vajalik meetod on toetamata"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Avan %s kalendri"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Avan kausta %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -5853,55 +5884,60 @@ msgstr "Oktoober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Vaja on v�hemalt �hte osav�tjat"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema m��rtud."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Teave s�ndmuse kohta"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Teave �lesande kohta"
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Mittekohustuslik info"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Vaba/H�ivatud informatsioon"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalendri info"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Uuenda"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "V�rskenda nimekirja"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema s�ndmusest osav�tja."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Ei saa laadida Bonobot"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -6128,9 +6164,8 @@ msgid "Print Calendar"
 msgstr "Tr�ki kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Tr�kkimise eelvaade"
 
@@ -6166,8 +6201,8 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Seda k�simust rohkem mitte esitada."
 
@@ -6233,17 +6268,29 @@ msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Impordib VKaardi-vormingus failid Evolution'i."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Ei saa k�tte s�numit %s kaustast %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Meeldetuletaja"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendri s�num"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6252,113 +6299,113 @@ msgstr ""
 "Evolution leidis Pine postifaile.\n"
 "Kas sa soovid neid Evolutionisse importida?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now n�uab 0 argumenti"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time n�uab 1 argumenti"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 1. argument peab olema string"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time 1. argument peab olema ISO 8601 vormingus kuup�eva/kella string"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day vajab 2 argumenti"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 1. argument peab olema time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Otsinguavaldise t�itmine ei andnud t�ev��rtuset��pi v��rtust"
 
@@ -7958,72 +8005,82 @@ msgstr "S�ilitan Kausta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni t�itmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Kaustade s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri anal��sil: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri t�itmisel: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Puhverkausta pole v�imalik avada"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Puhverkausta pole v�imalik t��delda"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "V�etakse vastu teadet %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Kausta s�nkroniseerimine"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d. teate juures %d'st tekkis viga"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Vigased argumendid"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Vigased argumendid"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga filtri abil otsimisel %s: %s"
@@ -8080,7 +8137,7 @@ msgstr "S�numite liigutamine"
 msgid "Copying messages"
 msgstr "S�numite liigutamine"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8088,46 +8145,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Katkestatud."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus POP serverilt: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, 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:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8135,18 +8192,18 @@ msgid ""
 "%.*s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "S�numi lahtikr�ptimine eba�nnestus."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, 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"
@@ -8172,22 +8229,22 @@ msgid "Could not lock '%s'"
 msgstr "'%s' ei �nnestnud lukustada"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lukufaili ei �nnestunud luua - %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "%s - Lukufaili saamise p�ring �letas ajapiirangu. �rita hiljem uuesti."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) abil lukustamine nurjus: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) abil lukustamine nurjus: %s"
@@ -8246,11 +8303,15 @@ msgstr "Viga ajutise postifaili kirjutamisel: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Viga ajutise postifaili kopeerimisel: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8381,7 +8442,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -8555,26 +8616,134 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Sertifikaatide kontroll eba�nnestus."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Sertifikaatide kontroll eba�nnestus."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Allkirjafail"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifikaadi ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Viga %s laadimisel"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Kontorist v�ljas"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Sertifikaatide kontroll eba�nnestus."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifikaadi ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Vigane parameeter"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifikaadi ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifikaadi ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8583,16 +8752,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8607,32 +8788,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Viga %s k�ivitamisel"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta �mbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
@@ -8640,12 +8826,12 @@ msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -8674,40 +8860,40 @@ msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ootamatu OK vastus IMAP serverilt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ei saa luua kataloogi %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ei saa laadida %s kokkuv�tet"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "See s�num ei ole hetkel k�ttesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "V�tan kokkuv�tvat infot uute s�numite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia s�numi sisu FETCH vastuses."
 
@@ -8716,10 +8902,10 @@ msgstr "Ei leia s�numi sisu FETCH vastuses."
 msgid "Could not open cache directory: %s"
 msgstr "Ei suuda avada puhverkataloogi: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "S�numi %s puhverdamine eba�nnestus: %s"
@@ -8732,7 +8918,7 @@ msgstr "Kontrollin uusi s�numeid"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Kaustad"
 
@@ -8762,7 +8948,7 @@ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Parool"
 
@@ -8770,73 +8956,77 @@ msgstr "Parool"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s teenus %s jaoks %s peal"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "�hendus katkestatud"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa �henduda %s (port: %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatsioon ei ole toetatud"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentimine eba�nnestus."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Kaust ei ole t�hi"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimist��bi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPalun sisesta IMAP parool %s@%s jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8844,31 +9034,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8891,7 +9087,10 @@ msgid "Local delivery"
 msgstr "Kohalik postijagaja"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Kohalikku e-posti v�etakse standardsest \"mbox\" vorminguga puhvrist"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8919,14 +9118,14 @@ msgstr "Standardne Unix'i \"mbox\" puhver"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
 "puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8937,38 +9136,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ei saa kustutada kausta kokkuv�ttefaili '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ei saa kustutada kausta indeksfaili '%s': %s"
@@ -9028,7 +9227,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9066,26 +9265,26 @@ msgstr "ei ole maildir vormingus kataloog"
 msgid "Could not scan folder `%s': %s"
 msgstr "Ei saa lugeda kausta '%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Kontrollin uusi s�numeid"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Kontrollin uute s�numite olemasolu"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Kausta s�ilitamine"
@@ -9129,7 +9328,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9138,7 +9337,7 @@ msgstr ""
 "Ei saa avada faili '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9147,14 +9346,14 @@ msgstr ""
 "Ei saa luua faili '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavaline fail."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9163,7 +9362,7 @@ msgstr ""
 "Ei saa kustutada kausta '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole t�hi, j�tan kustutamata."
@@ -9178,64 +9377,64 @@ msgstr "Ei saa avada kausta: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ei saa kontrollida kausta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ei saa avada faili: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ei saa avada ajutist kirjakasti: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Ajutise kausta sulgemine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tundmatu viga: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kausta �mbernimetamine eba�nnestus: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Viga ajutise kirjakasti kirjutamisel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Ajutisse kirjakasti kirjutamine eba�nnestus: %s: %s"
@@ -9382,50 +9581,50 @@ msgstr "T�hista"
 msgid "Operation failed: %s"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "V�tan vastu POP kokkuv�tet"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operatsioon katekstatud"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ei saa salvestada kokkuv�tet: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "H�vitan kustutatud s�numid"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "V�tan vastu POP s�numit nr %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Ei saa k�tte s�numit: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Teadmata sademed"
@@ -9443,7 +9642,7 @@ msgstr "J�ta s�numid serverisse"
 msgid "Delete after %s day(s)"
 msgstr "Kustuta %s p�eva m��dumisel"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9464,6 +9663,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Ei saa �henduda %s (port: %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9475,52 +9679,57 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAPi k�sk eba�nnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/O viga"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"SMTP serveri jaoks autentimine nurjus.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s POP3 parool"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9546,35 +9755,35 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Sendmail'i haruprotsessi pole v�imalik tekitada: %s: e-post j�i saatmata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ei saa saata s�numit: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail l�petas t�� signaaliga %s: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ei saa k�ivitada %s: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail l�petas t�� staatusega %d: s�numit ei saadetud."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9682,45 +9891,45 @@ msgstr "Ajutine autentimine eba�nnestus"
 msgid "Authentication required"
 msgstr "Autentimine on vajalik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Tervituse vastuse viga: %s: v�imalik, et mittefataalne"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ei saa luua �hendust POP serveriga.\n"
 "Viga kasutajanime saatmisel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "S�num ei tundu olevalt �igesti vormistatud"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s ei toeta k�situd autentimist��pi %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPalun sisesta %s@%s SMTP parool"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9731,90 +9940,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posti saatmine %s kaudu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "S�numi saatmine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ei saa saata s�numit: saajate aadressid on m��ramata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP tervitus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO p�ring �letas ajalimiidi: %s: mittefataalne"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO vastuse viga: %s: mittefataalne"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET vastuse viga: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP autentimine"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Viga SASL autentimisobjekti loomise."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH p�ring nurjus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Halb autentimisvastus serverilt.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM vastuse viga: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
@@ -9822,91 +10031,91 @@ msgstr "DATA p�ring �letas ajalimiidi: %s: s�num j�i saatmata"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA saatmine �letas ajalimiidi: s�numi t�histamine: %s: s�num j�i saatmata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Serverilt saadi vigane autentimise vastus."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET vastuse viga: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT p�ring �letas ajalimiidi: %s: mittefataalne"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH p�ring �letas ajalimiidi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET vastuse viga: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bait"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u baiti"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Lisa s�numile manus"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ei saa lisada faili manusesse: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ei saa lisada faili manusesse %s: see ei ole tavaline fail"
@@ -9924,72 +10133,84 @@ msgid "MIME type:"
 msgstr "MIME t��p:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu vaatamiseks kliki siia"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Saatja:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Vastus:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Saatja:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Teema:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Adressaat:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Sisesta s�numi adressaadid"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse s�numi koopiad"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse s�numi pimekoopiad."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Lisab s�numile faili"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ei saa salvestada allkirjafaili."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9998,48 +10219,48 @@ msgstr ""
 "Viga faili %s lugemisel:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Hoiatus!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fail on juba olemas. Kirjutada �le?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Viga faili salvestamisel: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Viga faili laadimisel: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10048,7 +10269,7 @@ msgstr ""
 "Viga kirja automaatsel salvestamisel: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10056,7 +10277,7 @@ msgstr ""
 "Ximian Evolution leidis eelmisest sessioonist salvestamata faile.\n"
 "Kas sa soovid �ritada nende taastamist?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10066,49 +10287,45 @@ msgstr ""
 "\n"
 "Kas sa soovid muudatused salvestada?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Sisesta fail"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Allkirja salvestamine"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (vaikimisi)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "S�numi koostamine"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10116,9 +10333,9 @@ msgstr ""
 "Ei saa luua s�numiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10180,8 +10397,8 @@ msgstr "Teema sisaldab"
 msgid "Subject does not contain"
 msgstr "Teema ei sisalda"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10189,12 +10406,11 @@ msgstr ""
 "Antud nimega fail eksisteerib.\n"
 "Kirjutada �le?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "J�ta see parool meelde"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10293,150 +10509,101 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "aasta"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "aastat"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekundit"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "kuu"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "kuud"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "tund"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "n�dal"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "n�dalat"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "tund"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "kuu"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "kuud"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekundit"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "aasta"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "aastat"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Sa unustasid kuup�eva valimata."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Sa valisid vigase kuup�eva."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"S�numi kuup�eva v�rreldakse filtreerimise\n"
-"hetkega v�i vKausta avamise hetkega."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"S�numi kuup�eva v�rreldakse allpool\n"
-"m��ratud ajahetkega."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"S�numi kuup�eva v�rreldakse ajahetkega,\n"
-"mis on suhteline filtri k�ivitamise hetkega.\n"
-"N�iteks: 2 n�dalat tagasi"
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "k�esoleva hetkega"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "m��ratud ajaga"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "ajaga, mis on suhteline k�esoleva hetkega"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Vali aeg, millega v�rrelda"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "V�rdle"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<kuup�eva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "praegu"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " tagasi"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "tagasi"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %d. %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d. %b %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " tagasi"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<kuup�eva valimiseks kliki siia>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Vali aeg, millega v�rrelda"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtreerimisreeglid"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stiili nimi:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "'%s' ei ole kataloog"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vali tegevus"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Siis"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Lisa tegevus"
 
 # !PARANDA! - kas "mine tagasi" on ikka hea?
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10444,12 +10611,12 @@ msgstr ""
 "Sa unustasid kausta valimata.\n"
 "Palun mine tagasi ja vali kaust, kuhu post toimetada."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Vali kaust"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10458,92 +10625,168 @@ msgstr ""
 "Viga regulaaravaldises '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "T�htis"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "p�rast"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime m��rama."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Reegli nimi: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Kui"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "K�ivita tegevused"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "kui k�ik tingimised on t�idetud"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "kui m�ni tingimus on t�idetud"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Lisa tingimus"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "v�ljaminev"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "V�rdle"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Muuda filtreid"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Muuda VKaustu"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Sissetulev"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "V�ljaminev"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"S�numi kuup�eva v�rreldakse allpool\n"
+"m��ratud ajahetkega."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"S�numi kuup�eva v�rreldakse ajahetkega,\n"
+"mis on suhteline filtri k�ivitamise hetkega.\n"
+"N�iteks: 2 n�dalat tagasi"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"S�numi kuup�eva v�rreldakse allpool\n"
+"m��ratud ajahetkega."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuaalsed kaustad"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "ajaga, mis on suhteline k�esoleva hetkega"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "tagasi"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "ainult kirjeldatud kaustad"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "k�esoleva hetkega"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "m��ratud ajaga"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vKausta allikad"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "koos k�igi aktiivsete v�rgukaustadega"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "koos k�igi kohalike ja aktiivsete v�rgukaustadega"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "koos k�igi kohalike kalatoogidega"
 
@@ -10571,42 +10814,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Firma"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "sisaldab"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopeeri kausta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Vastuv�tmise kuup�ev"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Saatmise kuup�ev"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ei sisalda"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ei l�ppe"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ei ole olemas"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemas"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ei k�la kui"
@@ -10628,93 +10871,89 @@ msgid "ends with"
 msgstr "l�ppeb"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "On olemas"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "on olemas"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Avaldis"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "T�htis"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "on p�rast"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "on enne"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "T�histatud"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "on suurem kui"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "on v�iksem kui"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "T�histatud"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Postiloend (list)"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "S�numi sisu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Kirja p�is"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "T�sta kausta"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Saada kontaktile s�num"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "M�ngi heli:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Loetud"
 
@@ -10730,57 +10969,87 @@ msgstr "Regulaaravaldis vastab"
 msgid "Replied to"
 msgstr "Vastatud kellele"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurem kui"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "on v�iksem kui"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skoor"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Saatja"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "M��ra olek"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Suurus (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "k�lab kui"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "L�htekonto"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "P�ise erip�ra"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "algab"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Peata t��tlemine"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Teema"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "M��ra olek"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reeglid"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Reegli lisamine"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Reegli muutmine"
 
@@ -10788,11 +11057,11 @@ msgstr "Reegli muutmine"
 msgid "Score Rules"
 msgstr "Skoori reeglid"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Sa pead sellele vKaustale nime m��rama."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10800,31 +11069,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu s�numeid programmist Elm'i"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Impordin"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Palun oota"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Kontrollin %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Post"
 
@@ -10885,39 +11154,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution impordib sinu Netscape andmeid"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Pr�gi"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Kohaliku posti fail %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Kontrollin kausta"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Impordi alustamine"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "S�tted"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Muuda filtreid"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10994,12 +11263,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "E_i kordu"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontod"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11047,64 +11316,84 @@ msgstr "Omadused..."
 msgid "Change this folder's properties"
 msgstr "Muudab selle kataloogi omadusi"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Hoiatus: salvestamata s�num"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Uus s�num"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Saada s�num"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "S�numi koostamine"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Uus s�num"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Eelmisele s�numile"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Uus s�num"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "�hendun serverisse..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" omadused"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Omadused"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
@@ -11154,135 +11443,135 @@ msgstr "kokku: %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo s�numi baasil _Virtuaalne Kaust"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema j�rgi"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja j�rgi"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide j�rgi"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema j�rgi"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja j�rgi"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide j�rgi"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut s�numit..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Tr�ki"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vasta k�igile"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Saada edasi"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "L�petatud"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Puhasta"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_M�rgi loetuks"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "M�rgi kui l_ugemata"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "M�rgi t�_htsaks"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "M�rgi v�het_�htsaks"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Taasta"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_T�sta kausta..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja aadressiraamatusse"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Rakenda filtrid"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Loo s�numi baasil _reegel"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VKaust _postiloendi j�rgi"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter  p_ostiloendi j�rgi"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VKaust _postiloendi j�rgi"
@@ -11344,76 +11633,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution'i uudiseredaktor"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution'i kontoredaktor"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Konto nimi:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Kataloog:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua �he nimega kahte kontot."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Oled sa kindel, et soovid seda kontot kustutada?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "�ra kustuta"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Kas t�esti kustutame konto?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Keela"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Luba"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Konto nimi:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11423,30 +11703,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "S�numi saaja: %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Teema on %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "S�numi saatja: %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "postiloend %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11454,7 +11734,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11462,30 +11742,30 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Saata sellegipoolest?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11493,103 +11773,99 @@ msgstr ""
 "Sellel s�numil on teema v�li t�hi.\n"
 "Kas saadame ilma teemata?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%%s kirjutas %a, %d.%m.%Y kell %H:%M:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "T�sta s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopeeri s�num(id) kausta..."
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "�htegi s�numit ei ole valitud"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Kirjutada fail �le?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "S�numi salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "S�numite salvestamine teise nimega..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Kuvab j�rgmise lugemata s�numi"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11601,7 +11877,7 @@ msgstr ""
 "\n"
 "Kas t�esti eemaldame kustutatud s�numid?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11610,28 +11886,28 @@ msgstr ""
 "Viga filtriinfo laadimisel:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "T�mban %d. s�numit %dst"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "S�numi tr�kkimine"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "S�numi tr�kkimine nurjus"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11652,7 +11928,7 @@ msgstr "Kirjeldus puudub"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimetu kontakt"
@@ -11673,10 +11949,11 @@ msgid "Add Signature"
 msgstr "Allkirja salvestamine"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
 "\"Mittekohustuslikud\" v�ljad\n"
@@ -11684,10 +11961,10 @@ msgstr ""
 "s�numitesse."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu v�tta. "
 "Kui sa ei ole para-\n"
@@ -11699,10 +11976,10 @@ msgid "Please select among the following options"
 msgstr ""
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
 "v�lja saata. Kui sa ei ole\n"
@@ -11712,53 +11989,27 @@ msgstr ""
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution'i kontoassistent"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "p�rast"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "�hendun serverisse..."
 
@@ -12021,244 +12272,232 @@ msgstr "Salvesta ja sulge"
 msgid "Loading Images"
 msgstr "_Lae pildid"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Kirja p�is"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "S�numi _kuvamine"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikroneesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "E-posti seadistamine"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Uudistekanalid"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
 # !PARANDA! - siia peaks leidma s�na, mis ei oleks eitav
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Mittekohustuslik info"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "T_��koht:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _V�tme ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Vali v�rvus"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tr�kib valitud kontaktid"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "S�numi avamine eba�nnestus"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Tsitaadina"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_J�ta see parool meelde"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastus:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "E-posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Vastuv�tmise valikud"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "J�ta see parool meelde"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Kohustuslik info"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Vaikimisi"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvalisus"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vali PGP programm"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posti saatmine"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Saadetud _s�numite kaust:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Saadetud s�numid ja mustandid"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vajab _autentimist"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serveri seadistused"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serveri _t��p: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kiirvalikud"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Allkirja salvestamine"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Allikas"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Allika info"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiili nimi:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standardne Unix'i mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12268,204 +12507,200 @@ msgstr ""
 "\n"
 "J�tkamiseks vajuta \"J�rgmine\". "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Idast"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "L_ae pildid alati v�rgust"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "V�ljuvad s�numid _allkirjastatakse alati selle konto abil"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentimise t��p: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Kontrolli uusi s�numeid automaatselt"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikaadi ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Kausta puhastamisel k�si kinnitust"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Vaikimisi"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Luba"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Saada edasi m��ratud kujul"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_T�isnimi"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML s�numis"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Lae pildid ainult, kui saatja on aadressiraamatus"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "See konto on minu _vaikimisi konto"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_M�rgi s�num loetuks peale"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_�ra lae �htegi pilti v�rgust"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP programmi asukoht:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, 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:174
+#: mail/mail-config.glade.h:170
 #, 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:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Posti vastuv�tmine"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vasta k�igile"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Turvalisus"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posti saatmine"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "N�ita aega kui"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML allkiri:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Kasuta turvalist �hendust (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Muutlik"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_intervalliga:"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " v�rvusega"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12489,217 +12724,227 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Salvesta kettale..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Salvesta kaasatud fail"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Kuva s�numi sees"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Kuva s�numi sees (%s abil)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "�ra kuva"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Lae pildid"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Hilinenud �lesanded:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d. %b %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopeeri viida asukoht"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Salvesta pilt kui..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" t��pi manus"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuup�ev"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr ""
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Kellelt"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr ""
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Postiprogramm:"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "S�numi salvestamine teise nimega..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "See s�num on digitaalselt allkirjastatud. Lisainfo jaoks kliki lukuikoonil."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�henduse loomine POP serveriga nurjus: %s"
 
 # !PARANDA! - kas on ikka t�pne t�lge?
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "See s�num on digitaalselt allkirjastatud ja autentne."
 
 # !PARANDA! - kas on ikka t�pne t�lge?
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "See s�num on digitaalselt allkirjastatud kuid ei ole autentne."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ei saa salvestada kausta metainfot faili %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kausta %s metaandmete kustutamine nurjus: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Muudan kausta \"%s\" vormingusse \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12708,7 +12953,7 @@ msgstr ""
 "Viga tegevusel '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12717,7 +12962,7 @@ msgstr ""
 "Operatsiooni k�igus tekkis viga:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "T��tan"
 
@@ -12725,100 +12970,100 @@ msgstr "T��tan"
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "E-posti v�tmine"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Sellegipoolest saadeti s�num edukalt."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Saadan \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Saadan s�numit %d (kokku: %d)"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Salvestan s�numi kausta"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "T�stan s�numid %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Kontrollin kaustu \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Edasi saadetud s�numid"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avan kausta %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eemaldan kausta %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S�ilitan Kausta '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "V�rskendan kausta"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "T�hjendan kausta"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "V�tan vastu s�numit %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "V�tan vastu %d teadet"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvestan %d s�numit"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12827,45 +13072,40 @@ msgstr ""
 "V�ljundfaili loomine nurjus: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "�hendun lahti: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taastan �henduse: %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Otsi"
 
@@ -12920,32 +13160,40 @@ msgstr "Kataloog: %s, t��p: %s"
 msgid "Type: %s"
 msgstr "T��p: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "S�numite saatmine ja vastuv�tmine"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Katkesta k�ik"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Uuendan..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Ootan..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas t��."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_J�ta see parool meelde"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Palun sisesta %s parool"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Sisesta parool"
 
@@ -12972,7 +13220,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -13002,7 +13250,7 @@ msgstr "Edasi saadetud s�num - %s"
 msgid "Forwarded message"
 msgstr "Edasi saadetud s�num"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Edasi saadetud s�num"
 
@@ -13016,7 +13264,7 @@ msgstr ""
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13025,94 +13273,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vKaustad"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Muuda VKausta"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Proovitake redigeerida olematut vkausta '%s'."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Uus VKaust"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Teema puudub)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - s�num"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "N�gemata"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "N�htud"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Mitu n�gemata s�numit"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Mitu s�numit"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Madal"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "K�rge"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "K�rgeim"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "T�na %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a, %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d. %b %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "S�numite nimekirja koostamine"
 
@@ -13147,47 +13398,47 @@ msgstr "Vastu v�etud"
 msgid "Size"
 msgstr "Suurus"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Liigub edasi"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Allika info"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Saada edasi"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Vasta k�igile"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13211,16 +13462,16 @@ msgstr "Kausta \"%s\" tellimine"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Kausta \"%s\" tellimuse l�petamine"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "�htegi serverit ei ole valitud"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Palun vali server."
 
@@ -17681,11 +17932,11 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Lennujaam"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23106,8 +23357,8 @@ msgstr "Kirjeldus puudub"
 msgid "Mail summary"
 msgstr "S�numite kokkuv�te"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
@@ -23125,15 +23376,15 @@ msgstr "EETN"
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "P�eva lause"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Lisa uudistekanal"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Sisesta lisatava uudistekanali URL"
 
@@ -23145,27 +23396,27 @@ msgstr "Viga RDF'i allalaadimisel"
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Lisa"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Vihmavalingud"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "�lesanded puuduvad"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Kirjeldus puudub)"
 
@@ -24437,7 +24688,8 @@ msgid "Tasks "
 msgstr "�lesanded "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Ilmajaama s�tted"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24495,7 +24747,7 @@ msgstr "N�ita detaile"
 msgid "Cancel Operation"
 msgstr "Katkesta tegevus"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24509,20 +24761,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Vali kaust"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "V�ljundkast"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Saadetud"
 
@@ -24740,22 +24992,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Uue kausta loomine"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Valitud kausta t��p ei ole vastavuses\n"
-"k�esoleva tegevusega."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Loo _uus kaust..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Uus..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -24772,7 +25017,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
@@ -24803,21 +25048,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s ei leitud."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution'i viga "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24826,11 +25067,11 @@ msgstr ""
 "Puudub importija, mis suudaks hakkama saada failiga\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importimine"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24839,17 +25080,17 @@ msgstr ""
 "Impordin %s.\n"
 "K�ivitan %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Viga %s k�ivitamisel"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga %s laadimisel"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24858,32 +25099,32 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Vali fail"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Faili t��p:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Impordi teiste programmide andmeid ja s�tted"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Impordi �ksikut faili"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24891,24 +25132,24 @@ msgstr ""
 "Palun oota...\n"
 "�ritan tuvastada olemasolevaid programme"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Vali kaust, kuhu salvestada imporditavad andmed"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Impordi"
 
@@ -24956,9 +25197,14 @@ msgstr "Avan kausta %s"
 msgid "in \"%s\" ..."
 msgstr "Ava programmiga %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kausta �mbernimetamine eba�nnestus: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kirjeldatud kausta loomine nurjus:\n"
 "%s"
@@ -24974,8 +25220,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Uus"
@@ -25016,58 +25262,59 @@ msgstr "Ava kaust..."
 msgid "Select the folder that you want to open"
 msgstr "Vali kaust, mida soovid avada"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Uue kiirvaliku loomine"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vali kaust, millele kiirvalik peab osutama:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "�hendu v_�rku"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Kausta ei n�idata)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Puudub)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution on hetkel v�rku �hendatud.  Autonoomsesse olekusse "
 "siirdumiseks vajuta seda nuppu."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution on hetkel autonoomses olekus. V�rku �hendumiseks vajuta "
 "seda nuppu."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25075,12 +25322,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25091,31 +25338,31 @@ msgstr ""
 "l�petas ootamatult. Et nendele andmetele uuesti ligi p��seda, pead\n"
 "sa Evolution'i sulgema ja seej�rel taask�ivitama."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Ei leia h��lestusandmebaasi"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "�ldine viga"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Loo uus kiirvalikute grupp"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Grupi nimi:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25124,107 +25371,117 @@ msgstr ""
 "Soovite Te t�esti eemaldada kiirvalikute\n"
 "ribalt gruppi `%s'?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "�ra eemalda"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Nimeta kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Nimeta valitud grupp uue nimega:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_V�iksed ikoonid"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "N�ita kiirvalikuid v�ikeste ikoonidega"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Suured ikoonid"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "N�itab kiirvalikuid suurte ikoonidena"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Uus grupp"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Loob uue kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Eemalda see grupp..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Eemaldab kiirvalikute grupi"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Nimeta see grupp �mber..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Nimeta see kiirvalikute grupp �mber"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Peida kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Peidab kiirvalikute riba"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Uue kiirvaliku loomine"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Uue kiirvaliku loomine"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Kiirvalikute �mbernimetamine"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Nimeta valitud kiirvalik uue nimega:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Ava _uues aknas"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avab kausta, mis on seotud selle kiirvalikuga, uues aknas"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Nimeta �mber"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Nimeta see kiirvalik �mber"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Eemalda"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eemaldab kiirvalikute ribalt selle korralduse"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Viga kiirvalikute salvestamisel."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Kiirvalikud"
 
@@ -25233,55 +25490,55 @@ msgstr "Kiirvalikud"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Vigu ei tekkinud"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Selle nimega kaust on juba olemas"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Kirjeldatud kaustat��p on vigane"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O viga"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Pole piisavalt ruumi kausta loomiseks"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Kaust ei ole t�hi"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Antud kausta ei leitud"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operatsioon ei ole toetatud"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Kirjeldatud kausta ei saa muuta ega eemaldada"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Sa ei saa luua selle nimega kausta"
 
@@ -25328,63 +25585,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA viga"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Katkestatud"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Vigane parameeter"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Omanik puudub"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Ei leitud"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Toetamata t��p"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Toetamata skeem"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Toetamata tegevus"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Sisemine viga"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Olemas"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Vigane URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Sisaldab alamkaustu"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Vaba ruum on otsas"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -25409,6 +25666,26 @@ msgstr "Host"
 msgid "The following connections are currently active:"
 msgstr "Hetkel on aktiivsed j�rgnevad �hendused:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktid:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "E-_Post"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "�lesanded"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Kausta nimi:"
@@ -25421,6 +25698,34 @@ msgstr "Kausta t��p:"
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Loo _uus kaust..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Kausta nimi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Serveri nimi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Konto nimi:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution'i seadistamise assistent"
@@ -25510,15 +25815,15 @@ msgstr "Seda k�simust mitte rohkem esitada"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid j�rgnevatest failidest:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution l�petab t�� ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25538,53 +25843,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Seda k�simust mitte rohkem esitada"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Keela tiitelkuva"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Impordi alustamine"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo komponentide s�steemi l�htestamine nurjus"
 
@@ -25621,116 +25926,110 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Ko_peeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Loob uue kontakti"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Loob uue kontaktide nimekirja"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "L�ikab valiku"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Kustutab valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "T�stab valitud s�numi teise kausta"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_T�sta kausta..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Kleebib l�ikepuhvri"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Tr�kitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Tr�kkimise _eelvaade"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tr�kib valitud kontaktid"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Salvestab valitud kontaktid VKaardina."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Vali k�ik"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Valib k�ik kontaktid"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Saada s�num valitud kontaktidele"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Saadab s�numi kontaktile"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Saadab valitud kontaktid teisele isikule."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Peata"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Peata laadimine"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "k�esoleva hetkega"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Kontaktide _nimekiri"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Saada kontakt edasi..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_T�sta kausta..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Salvesta VKaardina"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Otsi kontakte"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Vali k�ik"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Saada _kontaktile s�num"
@@ -25775,11 +26074,6 @@ msgstr "Kuu"
 msgid "Previews the calendar to be printed"
 msgstr "Tr�kitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Tr�kkimise _eelvaade"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Tr�kib selle kalendri"
@@ -25813,7 +26107,7 @@ msgstr "N�dal"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Sulge"
 
@@ -25826,7 +26120,7 @@ msgid "Delete this item"
 msgstr "Kustutab elemendi"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -25838,8 +26132,8 @@ msgstr "Tr�kitava elemendi eelvaatlemine"
 msgid "Print this item"
 msgstr "Tr�kib elemendi"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Salvesta"
 
@@ -25864,9 +26158,9 @@ msgstr "Salvestab elemendi kettale"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fail"
 
@@ -25876,7 +26170,7 @@ msgstr "Tr�ki _�mbrik"
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "S_alvesta kui..."
 
@@ -25890,8 +26184,8 @@ msgstr "Saada _kontaktile s�num"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Salvesta"
 
@@ -25988,26 +26282,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Eemaldab l�plikult k�ikidest kaustadest k�ik kustutatud s�numid"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Uus s�num"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Salvestan s�numi kausta"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "N�itab s�numi eelvaate akent"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuaalse kausta _redaktor..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtrid..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Eelvaate paan"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Kaustade _tellimine..."
 
@@ -26104,7 +26408,7 @@ msgstr "Esitab s�numeid jutul�ngadena"
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Kaust"
 
@@ -26365,182 +26669,197 @@ msgstr "Eelmisele lugemata s�numile"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "�lesande vastus"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Kontrolli uusi s�numeid k�ikides kaustades"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Eelmisele t�htsale s�numile"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Tr�kitava s�numi eelvaatlemine"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Eelmine"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Tr�kib valitud s�numi"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Saadab valitud s�numi kellelegi edasi"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Taastab teksti algse suuruse"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Otsi s�numist..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_V�iksem"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Salvestab s�numi tekstifaili"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Otsib teksti kuvatud s�numi sisust"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Lehek�lje s�tted aktiivse printeri jaoks"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "_N�ita e-post l�htekoodi"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "N�ita k�iki _p�iseid"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "N�ita s�numit normaalse stiiliga"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "N�ita s�numit koos k�igi p�istega"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "N�ita s�numit t��tlemata kujul"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Teksti _suurus"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Taasta valitud s�numid"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VKaust _postiloendi j�rgi..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VKaust _saatja j�rgi..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VKaust _adressaatide j�rgi..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VKaust _teema j�rgi..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Manusta"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopeeri teise kausta"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Loo s�numi baasil filter"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Saada s�num _edasi"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Mine"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "S�numi sees"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "S�numi _kuvamine"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_T�sta teise kausta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "J�rgmisele s�numile"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Harilik kuva"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Ava s�num"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Eelmisele s�numile"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Tsitaadina"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Muuda nime..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "T_��riistad"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Taasta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Sulge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vaade"
 
@@ -26568,169 +26887,161 @@ msgstr "Kr�ptib kirja sinu S/MIME kr�ptimissertifikaadi abil"
 msgid "For_mat"
 msgstr "Vor_mindamine"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Lisa fail s�numisse tekstina"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Lisa tekstifail..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ava"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Ava fail"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP kr�pteerimine"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP allkiri"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME kr�ptimine"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME allkiri"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salvesta kui"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Salvesta _mustand"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Salvesta kausta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Salvesta k�esolev fail"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Salvesta k�esolev fail teise nime all"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Salvesta k�esolev fail teise kausta"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Saada"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Saada _hiljem"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Saada _hiljem"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Saada s�num HTML formaadis"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Saada s�num hiljem"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Saadab s�numi"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "N�ita / peida manused"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "N�ita _manuseid"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "N�ita manuseid"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Allkirjastab s�numi sinu PGP v�tme abil"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Allkirjastab s�numi sinu S/MIME allkirjasertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "L�litab pimekoopia v�lja n�itamise sisse v�i v�lja"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "L�litab koopiav�lja n�itamise sisse v�i v�lja"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "L�litab saatjav�lja n�itamise sisse v�i v�lja"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "L�litab vasta-kellele v�lja n�itamise sisse v�i v�lja"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Manus..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Pimekoopia v�li"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "K_oopia v�li"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Kustuta k�ik"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Kellele v�li"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Lisa"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Ava..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Vasta-kellele v�li"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Abi"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Allkirja salvestamine"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lisab kausta sinu tellitud kaustade nimekirja"
@@ -26828,172 +27139,203 @@ msgid "Add to _Shortcut Bar"
 msgstr "Li_sa kiirvalikute paneelile"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Muudab kausta nime"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Teeb kaustast koopia"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Loo _uus kaust..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Loob kiirvalikute ribale viida sellele kaustale"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Loo uue kausta"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Uue kiirvaliku loomine"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Loo uue kausta"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Kustutab kausta"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "N�itab teist kausta"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_V�lju"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolutioni _aken"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "V�ljub programmist"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Impordib andmeid teistest programmidest"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "T�stab kausta teise kohta"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Loo _uus kaust..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Ava uues aknas"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Avab kausta uues aknas"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot'i s�tted"
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Saada / v�ta vastu"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr ""
 "Saadab j�rjekorras olevad v�ljaminevad kirjad ja t�mbab �ra uued kirjad."
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "E-posti seadistamine"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "N�ita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "L�litab kaustade riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "L�litab kiirvkorralduste riba sisse v�i v�lja"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "L�litab autonoomse reziimi sisse v�i v�lja"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "N�itab valitud kausta"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolutioni _KKK"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolutionist..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "Ko_peeri..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Kaustade riba"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Kaust"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Mine kausta"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_T�sta mujale..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Uus k_aust"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot'i s�tted"
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "E_i kordu"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Muuda nime..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Saada / V�ta vastu"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "Kiir_valik"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Kiir_valikute riba"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "Kiir_valik"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Tr�kib kokkuv�tte "
@@ -27007,17 +27349,40 @@ msgid "Reload the view"
 msgstr "Laeb vaate uuesti"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Aadressikaardid"
+#, fuzzy
+msgid "By _Company"
+msgstr "Asutuse j�rgi"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Asutuse j�rgi"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Aadressikaardid"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefoninumbrite loetelu"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "N�dala vaade"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "P�eva vaade"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Kuu vaade"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "T��n�dala vaade"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27043,13 +27408,19 @@ msgstr "Teema j�rgi"
 msgid "Messages"
 msgstr "S�numid"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Kategooriaga"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_�lesanne"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27202,11 +27573,11 @@ msgstr "Kodeering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Otsinguredaktor"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
@@ -27246,21 +27617,21 @@ msgstr "S�num"
 msgid "Don't show this message again."
 msgstr "Seda teadet enam mitte n�idata."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Otsi n��d"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Puhasta"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Otsi n��d"
 
@@ -27274,19 +27645,116 @@ msgstr "Personal Addressbook Server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS l�htestamine nurjus"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME l�htestamine nurjus"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_T�sta mujale..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Kohtumise staatus on muutunud. Saata uuendatud versioon?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "K_ustuta valitud s�ndmus"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O viga"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Tervituse vastuse viga: %s: v�imalik, et mittefataalne"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO p�ring �letas ajalimiidi: %s: mittefataalne"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO vastuse viga: %s: mittefataalne"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT p�ring �letas ajalimiidi: %s: mittefataalne"
+
+#~ msgid "Insert File"
+#~ msgstr "Sisesta fail"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Sa valisid vigase kuup�eva."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "S�numi kuup�eva v�rreldakse filtreerimise\n"
+#~ "hetkega v�i vKausta avamise hetkega."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution'i uudiseredaktor"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Oled sa kindel, et soovid seda uudistekontot kustutada?"
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Uudistekanalid"
+
+#~ msgid "Source"
+#~ msgstr "Allikas"
+
+#~ msgid "Source Information"
+#~ msgstr "Allika info"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Salvesta kettale..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "S�numi salvestamine teise nimega..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Uue kausta loomine"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Valitud kausta t��p ei ole vastavuses\n"
+#~ "k�esoleva tegevusega."
+
+#~ msgid "_Contact List"
+#~ msgstr "Kontaktide _nimekiri"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Lisa fail s�numisse tekstina"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Lisa tekstifail..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Saada _hiljem"
+
+#~ msgid "Send _later"
+#~ msgstr "Saada _hiljem"
+
+#~ msgid "Send the message later"
+#~ msgstr "Saada s�num hiljem"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot'i s�tted"
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Aadressiraamatu allikas"
 
@@ -27402,10 +27870,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Allkirjafail"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Kustuta k�ik peale allkirja"
 
@@ -27770,12 +28234,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldova Vabariik"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Lisab uue s�ndmuse"
-
-#~ msgid "Create a new task"
-#~ msgstr "Lisab uue �lesande"
-
 #~ msgid "New _Task"
 #~ msgstr "Uus _�lesanne"
 
@@ -27943,9 +28401,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisatsioon"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_J�ta see parool meelde"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Vaikimisi saadetakse HTML vormingus s�numeid"
 
@@ -28019,9 +28474,6 @@ msgstr "init_bonobo(): Bonobo l�htestamine nurjus"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Loob v�i muudab mailikontosid ja muid s�tteid"
 
-#~ msgid "New Message"
-#~ msgstr "Uus s�num"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_S�numite s�tted..."
 
diff --git a/po/eu.po b/po/eu.po
index 08bf9c1e14..42ff99141e 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: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Wali�o <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -34,7 +34,7 @@ msgstr "VCard fitxategiak Evolution-era inportatzen ditu."
 msgid "File As"
 msgstr "Jaso honela"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
@@ -342,46 +342,46 @@ msgstr "%s(r)en VCard-a"
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Kargatzen..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Errorea bilaketa-adierazpenean."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "LDAP zerbitzarian txartela gehitzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "LDAP zerbitzaritik txartela kentzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP zerbitzariko txartela aldatzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Bilaketa berrabiarazten."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -472,11 +472,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -492,22 +492,31 @@ msgstr "LDAP zerbitzaria"
 msgid "LDAP server containing contact information"
 msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontaktua"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sortu kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Kontaktuen zerrenda"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontaktua"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sortu kontaktu-zerrenda berria"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -530,30 +539,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
@@ -561,11 +570,11 @@ msgstr "Ezin izan da gnome-vfs hasieratu"
 msgid "Other Contacts"
 msgstr "Beste kontaktu batzuk"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Ezin da helbide-liburua ireki"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -575,7 +584,7 @@ msgstr ""
 "okerreko URIa idatzi duzula, edo LDAP zerbitzaria\n"
 "ez dabilela"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -587,7 +596,7 @@ msgstr ""
 "programa konpilatu behar duzu CVS iturburuetatik\n"
 "beheko estekatik OpenLDAP eskuratuz.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -595,44 +604,44 @@ msgstr ""
 "Ezin izan dugu helbide-liburu hori ireki.  Egiaztatu bide-izena\n"
 "badagoela eta atzitzeko baimena baduzula. "
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "honela amaitzen da"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "2. helb. el."
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategoria da"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
@@ -754,7 +763,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Helbide-liburuaren iturburuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -854,8 +863,8 @@ msgstr "Konfigurazioa"
 msgid "Mappings"
 msgstr "Marjinak"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_dagoen, maiztasun honekin"
@@ -909,8 +918,8 @@ msgstr "Bilaketa _barrutia: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Bilaketa"
 
@@ -1108,15 +1117,15 @@ msgid "Using email address"
 msgstr "Helbide elektronikoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Gehitu"
 
@@ -1164,12 +1173,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "_Deskarga-muga"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edizioa"
@@ -1285,10 +1294,10 @@ msgstr "Helbide-liburuko izen-hautaketaren interfazerako fabrika"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Kendu"
 
@@ -1317,43 +1326,15 @@ msgstr "(%d ez da erakusten)"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Hautatu kontaktuak helbide-liburutik"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "bidaltzaileak hau dauka"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution-ek ezin du lortu helbide-liburuaren biltegi lokala.\n"
-"evolution-addressbook osagaia kraskatu delako izan daiteke.\n"
-"Problema hobeto aztertu eta konponbidea aurkitu ahal izan\n"
-"dezagun bidali mezua mesedez Jon Trowbridge-ri <trow@ximian.com> \n"
-"errorea nola gertatu den ahalik eta xehetasun handienaz kontatuz. \n"
-"  Eskerrik asko."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution-ek ezin du helbide-liburuaren biltegi lokala eskuratu.\n"
-"Egoera normalean, ez luke sekula gertatu beharko.\n"
-"Evolution-etik irten eta berriro sartu beharko duzu\n"
-"arazoa konpontzeko."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Hautatu kontaktuak helbide-liburutik"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Hautatu izenak"
@@ -1375,15 +1356,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Lekuz aldatu..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Karpeta:"
 
@@ -1489,11 +1465,12 @@ msgstr "HT_ML mezuak jaso nahi ditu"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -2726,7 +2703,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ezkutatu helbideak zerrenda honetara mezuak bidaltzean"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -2789,7 +2766,7 @@ msgstr ""
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
@@ -2817,21 +2794,21 @@ msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -2839,8 +2816,8 @@ msgstr "Errore ezezaguna"
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
@@ -2857,7 +2834,7 @@ msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2880,46 +2857,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "'%s' fitxategia ez dago "
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Txartelak bistaratu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Txartelak bistaratu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2929,19 +2911,19 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
@@ -3013,7 +2995,7 @@ msgstr "Helbide-liburua"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
@@ -3053,7 +3035,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
@@ -3062,8 +3044,8 @@ msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
@@ -3081,7 +3063,7 @@ msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
@@ -3092,20 +3074,20 @@ msgid "Copy"
 msgstr "Kopiatu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ezabatu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3270,7 +3252,7 @@ msgstr "Marjinak"
 msgid "Number of columns:"
 msgstr "Zutabe-kopurua:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Aukerak"
 
@@ -3360,26 +3342,26 @@ msgstr "Hitzordu izengabea"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Handia"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Definitu gabe"
@@ -3500,11 +3482,11 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3516,13 +3498,13 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Abisua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3539,7 +3521,7 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
@@ -3567,7 +3549,7 @@ msgstr "Azalpenak hau dauka"
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
@@ -3578,7 +3560,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3600,19 +3582,19 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Pribatua"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentziala"
@@ -3637,37 +3619,37 @@ msgstr "E"
 msgid "W"
 msgstr "M"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Okupatuta"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ez da hasi"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Egiten ari da"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Eginda"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3678,56 +3660,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Bai"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ez"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Egunaren ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Lan-astearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Astearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Egutegia"
 
@@ -3735,12 +3716,12 @@ msgstr "Egutegia"
 msgid "Folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zereginak"
 
@@ -3748,39 +3729,56 @@ msgstr "Zereginak"
 msgid "Folder containing to-do items"
 msgstr "Egiteko elementuak dauzkan karpeta"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Hitzordu berria"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Hitzordua"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Sortu hitzordu berria"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Bilera"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Sortu bilera-eskaera berria."
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Sortu zeregin berria"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Hitzordu berria"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Hitzordua"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Sortu hitzordu berria"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3848,7 +3846,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "egun "
 
@@ -3856,11 +3855,13 @@ msgstr "egun "
 msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "ordu "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutu "
 
@@ -3988,7 +3989,7 @@ msgstr "Oroigarriak"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4017,7 +4018,7 @@ msgstr "hitzordu-amaiera baino"
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -4195,7 +4196,7 @@ msgid "_Fri"
 msgstr "_Or."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Orokorra"
 
@@ -4241,19 +4242,33 @@ msgstr "A_z."
 msgid "before every appointment"
 msgstr "hitzordua hasi aurretik"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Bileraren egoera aldatu egin da. Bertsio eguneratua bidali?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ziur zaude zeregin hau bertan behera utzi eta ezabatu nahi duzula?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
@@ -4322,61 +4337,61 @@ msgstr "(Falta: "
 msgid "Due "
 msgstr "Falta: "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
@@ -4576,7 +4591,7 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4588,7 +4603,7 @@ msgstr "Funtzioa"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
@@ -4673,7 +4688,7 @@ msgstr "-"
 msgid "first"
 msgstr "zerrenda"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo "
 
@@ -4697,7 +4712,7 @@ msgstr "zerrenda"
 msgid "Other Date"
 msgstr "Beste fax bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "eguna"
 
@@ -4797,20 +4812,26 @@ msgstr "% Osatuta"
 msgid "Date Completed:"
 msgstr "Osatze-data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Ekintza behar du"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Lanean"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URLa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Egoera:"
 
@@ -4824,7 +4845,7 @@ msgstr "Oinarrizkoa"
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4893,80 +4914,80 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
@@ -4975,8 +4996,8 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5004,11 +5025,9 @@ msgstr "Lehentasuna"
 msgid "Start Date"
 msgstr "Hasiera-data"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Laburpena"
 
@@ -5050,110 +5069,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Hitz_ordu berria"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguratu %s"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfiguratu %s"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
@@ -5194,7 +5212,7 @@ msgstr "Zeregina eginda: <b>"
 msgid "Task Due: <b>"
 msgstr "Zeregina egiteko: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
@@ -5203,333 +5221,338 @@ msgstr "iCalendar informazioa"
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "K_okalekua:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -5575,7 +5598,7 @@ msgstr "data-hasiera"
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
@@ -5588,57 +5611,52 @@ msgid "Non-Participants"
 msgstr "Ez-partaideak"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Taldea"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Gela"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Mahaiburua"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Ekintza behar du"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegatua"
 
@@ -5728,48 +5746,45 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "Ezabatu _hitzordu hau"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5780,11 +5795,16 @@ msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s karpeta irekitzen"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -5841,53 +5861,58 @@ msgstr "urria"
 msgid "September"
 msgstr "iraila"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Partaide bat behar da gutxienez"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Antolatzailea ezarri behar da."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Gertaera-informazioa"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Egunkari-informazioa"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Egutegi-informazioa"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Eguneratu"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Freskatu zerrenda"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Ezin izan da Bonobo hasieratu"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Ezin izan da sortu osagai-editorearen fabrika"
 
@@ -6114,9 +6139,8 @@ msgid "Print Calendar"
 msgstr "Inprimatu egutegia"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
@@ -6151,8 +6175,8 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
@@ -6215,17 +6239,29 @@ msgstr "iCalendar fitxategiak Evolution-era inportatzen ditu"
 msgid "Imports vCalendar files into Evolution"
 msgstr "VCalendar fitxategiak Evolution-era inportatzen ditu"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Ezin izan da biltegiarekin konektatu: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Oroigarria"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Egutegi-mezua"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6234,84 +6270,84 @@ msgstr ""
 "Evolution-ek Pine posta-fitxategiak aurkitu ditu.\n"
 "Evolution-era inportatu nahi dituzu?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Egutegia"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "'time-now'k 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "'make-time'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "'make-time'k espero du 1 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "'make-time'ren 1 argumentuak ISO 8601 data/ordu katea izan behar du."
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "'time-add-day'k 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "'time-add-day'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "'time-add-day'k espero du 2 argumentua osoko zenbakia izatea"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "'time-day-begin'ek argumentu bat espero du"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "'time-day-begin'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "'time-day-end'ek argumentu bat espero du"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "'time-day-end'ek espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "'get-vtype'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "'occur-in-time-range?'k 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "'occur-in-time-range?'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "'occur-in-time-range?'k espero du 2 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "'contains?'ek 2 argumentu espero ditu"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "'contains?'ek espero du 1 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "'contains?'ek espero du 2 argumentua kate bat izatea"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6319,11 +6355,11 @@ msgstr ""
 "'contains?'ek espero du 1 argumentua \"any\", \"summary\", edo \"description"
 "\" izatea"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "'has-categories?'ek gutxienez argumentu bat espero du"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6331,19 +6367,19 @@ msgstr ""
 "'has-categories?'ek espero du argumentu guztiak kateak izatea eta argumentu "
 "bakarra izatea boolear faltsua (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "'is-completed?'ek 0 argumentu espero ditu"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "'completed-before?'k argumentu bat espero du"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "'completed-before?'k espero du 1 argumentua time_t izatea"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Bilaketa-adierazpenaren ebaluazioak ez du balio boolearrik eman"
 
@@ -7940,71 +7976,81 @@ msgstr "%s karpeta biltegiratzen"
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Argumentu baliogabeak"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Argumentu baliogabeak"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
@@ -8060,7 +8106,7 @@ msgstr "Mezuak eramaten"
 msgid "Copying messages"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8068,47 +8114,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna POP zerbitzaritik: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Ez da fitxategi-izenik eman."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8116,18 +8162,18 @@ msgid ""
 "%.*s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Huts egin du mezua deskodetzean."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8154,24 +8200,24 @@ msgid "Could not lock '%s'"
 msgstr "Ezin izan da '%s' blokeatu"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ezin izan da blokeo-fitxategirik sortu %s(r)entzat: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Denbora agortu zaizu %s(e)n blokeo-fitxategia hartzen saiatzean. Saiatu "
 "berriro geroago."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
@@ -8230,11 +8276,16 @@ msgstr "Errorea aldi baterako posta-fitxategia idaztean: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia kopiatzean: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Huts egin du desenkriptatzean: Ezezaguna"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Huts egin du desenkriptatzean: Ezezaguna"
@@ -8373,7 +8424,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -8549,33 +8600,134 @@ msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Jaulkitzailea: %s\n"
-"Gaia: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"%s(e)ko ziurtagiri txarra:\n"
-"\n"
-"%s\n"
-"\n"
-"Hala ere onartu nahi duzu?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Sinadura-fitxategia:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Ziurtagiri-IDa:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Errorea %s kargatzean"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Bulegotik kanpo"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Huts egin du ziurtagiriak egiaztatzean."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Ziurtagiri-IDa:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argumentu baliogabea"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Ziurtagiri-IDa:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Ziurtagiri-IDa:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8588,16 +8740,33 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "TXARRA"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%s(e)ko ziurtagiri txarra:\n"
+"\n"
+"%s\n"
+"\n"
+"Hala ere onartu nahi duzu?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8617,32 +8786,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Errorea %s abiaraztean"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -8651,12 +8825,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -8685,40 +8859,40 @@ msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -8727,10 +8901,10 @@ msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 msgid "Could not open cache directory: %s"
 msgstr "Ezin izan da cache-direktorioa ireki: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
@@ -8743,7 +8917,7 @@ msgstr "Mezu berririk dagoen begiratzen"
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Karpetak"
 
@@ -8773,7 +8947,7 @@ msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -8783,74 +8957,78 @@ msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, 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:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Karpeta ez dago hutsik"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8861,31 +9039,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8907,7 +9091,10 @@ msgid "Local delivery"
 msgstr "Banaketa lokala"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Posta lokala berreskuratzeko mbox formatuko spool estandarretatik."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8935,13 +9122,13 @@ msgstr "Unix mbox spool estandarrak"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8952,38 +9139,38 @@ msgstr "%s gordetze-erroa ez da bide-izen absolutua"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
@@ -9043,7 +9230,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9081,26 +9268,26 @@ msgstr "ez da maildir direktorioa"
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ezin da maildir direktorioaren bide-izena ireki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
@@ -9144,7 +9331,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9153,7 +9340,7 @@ msgstr ""
 "Ezin izan da `%s' fitxategia ireki:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9162,14 +9349,14 @@ msgstr ""
 "Ezin izan da `%s' fitxategia sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ez da fitxategi erregularra."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9178,7 +9365,7 @@ msgstr ""
 "Ezin izan da `%s' karpeta ezabatu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
@@ -9195,64 +9382,64 @@ msgstr ""
 "Posta-analizatzailearen ezinbesteko errorea %2$s karpetako %1$ld posiziotik "
 "gertu"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errorea aldi baterako postontzian idaztean: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
@@ -9403,47 +9590,47 @@ msgstr "Utzi bertan behera"
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Erabiltzaileak bertan behera utzi du"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ezin da POP laburpena hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ez dago %s uid-a duen mezurik"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ezin da %s mezua hartu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -9460,7 +9647,7 @@ msgstr "Utzi mezuak zerbitzarian"
 msgid "Delete after %s day(s)"
 msgstr "Ezabatu %s egunen ondoren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9487,6 +9674,11 @@ msgstr ""
 "erabiliz APOP protokoloaren bidez. Beharbada honek ez du erabiltzaile "
 "guztiekin funtzionatuko zerbitzariak onartzen duela adierazten badu ere."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9498,54 +9690,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Ez du eskatutako autentifikazio-mekanismoa onartzen."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL protokolo-errorea"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "S/Iko errorea: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Ezin izan da KPOP zerbitzarian autentifikatu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9570,35 +9764,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ezin izan da sendmail-en fork-a egin: %s: posta ez da bidali"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ezin izan da mezua bidali: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s seinalearekin irten da: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ezin izan da %s exekutatu: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d egoerarekin irten da: posta ez da bidali."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9707,46 +9901,46 @@ msgstr "Aldi baterako autentifikazioak huts egin du"
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Ongietorri-erantzunaren errorea: %s: beharbada ez da ezinbestekoa"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "QUIT erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9757,88 +9951,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO eskaera denboraz kanpo: %s: ez da ezinbestekoa"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO erantzunaren errorea: %s: ez da ezinbestekoa"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET erantzunaren errorea"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -9846,87 +10040,87 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT eskaera denboraz kanpo: %s: ez da ezinbestekoa"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ezin da %s fitxategia erantsi: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ezin da %s fitxategia erantsi: ez da fitxategi erregularra"
@@ -9944,56 +10138,60 @@ msgid "MIME type:"
 msgstr "MIME mota:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Nork:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Erantzun honi:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Nork:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Nori: "
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10001,17 +10199,25 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10020,34 +10226,34 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Kontuz!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10056,7 +10262,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10065,7 +10271,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10074,7 +10280,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10082,7 +10288,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10092,43 +10298,39 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Txertatu fitxategia"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "(lehenetsia)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10136,7 +10338,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10144,9 +10346,9 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10210,8 +10412,8 @@ msgstr "gaiak hau dauka"
 msgid "Subject does not contain"
 msgstr "gaiak ez dauka hau"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10219,12 +10421,11 @@ msgstr ""
 "Izen hori duen fitxategia badago lehendik.\n"
 "Gainidatzi?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Gogoratu pasahitz hau"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -10322,150 +10523,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "urte "
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "urte "
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "segundo "
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "hilabete "
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minutu "
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "hilabete "
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "ordu "
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "aste "
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "aste "
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "ordu "
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "hilabete "
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minutu "
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "hilabete "
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "segundo "
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "urte "
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "urte "
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Data aukeratzea ahaztu zaizu."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Data baliogabea aukeratu duzu."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Mezuaren data iragazkia exekutatzen den edo\n"
-"karpeta birtuala irekitzen den orduarekin\n"
-"konparatuko da."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Mezuaren data zuk hemen zehazten duzun orduarekin\n"
-"konparatuko da."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Mezuaren data iragazkia exekutatzen den \n"
-"orduarekiko erlazioan konparatuko da;\n"
-"\"bi aste lehenago\", adibidez."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "uneko ordua"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "zuk zehaztutako ordua"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "uneko orduarekiko erlatiboa den ordua"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Hautatu ordua"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Konparazio-ordua:"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<egin klik hemen data hautatzeko>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "orain"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr "lehenago"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %Y %b %d"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr "lehenago"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<egin klik hemen data hautatzeko>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Hautatu ordua"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Iragazteko arauak"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' spool-a ez dago edo ez da fitxategi erregularra"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Aukeratu ekintza bat:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Orduan"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Gehitu ekintza"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10473,12 +10624,12 @@ msgstr ""
 "Karpeta aukeratzea ahaztu zaizu.\n"
 "Zoaz atzera eta zehaztu posta banatzeko baliozko karpeta bat."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10487,92 +10638,168 @@ msgstr ""
 "Errorea '%s' adierazpen erregularrean:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Garrantzitsua"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "geroago"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Arau-izena: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Izengabea"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Baldin eta"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Exekutatu ekintzak"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "irizpide guztiak betetzen badira"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "irizpideren bat betetzen bada"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Gehitu irizpidea"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "sarrerakoa"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "irteerakoa"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Konparazio-ordua:"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editatu iragazkiak"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editatu karpeta birtualak"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Mezuaren data zuk hemen zehazten duzun orduarekin\n"
+"konparatuko da."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Mezuaren data iragazkia exekutatzen den \n"
+"orduarekiko erlazioan konparatuko da;\n"
+"\"bi aste lehenago\", adibidez."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Mezuaren data zuk hemen zehazten duzun orduarekin\n"
+"konparatuko da."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Karpeta birtualak"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "uneko orduarekiko erlatiboa den ordua"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "lehenago"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "zehaztutako karpetak bakarrik"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "uneko ordua"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "zuk zehaztutako ordua"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Karpeta birtualen iturburuak"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "urruneko karpeta aktibo guztiekin"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "karpeta lokal guztiekin"
 
@@ -10600,42 +10827,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Enpresakoa"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "hau dauka"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ez dauka hau"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ez da honela amaitzen"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ez dago"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ez dago"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ez da honen antzekoa"
@@ -10657,89 +10884,85 @@ msgid "ends with"
 msgstr "honela amaitzen da"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Exekutatu shell komandoa"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "badago"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Garrantzitsua"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "da"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "honen ondorengoa da"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "honen aurrekoa da"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "Banderaduna da"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "hau baino handiagoa da"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "hau baino txikiagoa da"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ez da"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ez da Banderaduna"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Exekutatu shell komandoa"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Irakurrita"
 
@@ -10755,57 +10978,87 @@ msgstr "Adierazpen erregularra"
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Exekutatu shell komandoa"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "honen antzekoa da"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "honela hasten da"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Ezarri egoera"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Arauak"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Gehitu araua"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
@@ -10813,11 +11066,11 @@ msgstr "Editatu araua"
 msgid "Score Rules"
 msgstr "Puntuazio-arauak"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 
@@ -10825,31 +11078,31 @@ msgstr "Gutxienez karpeta bat zehaztu behar duzu iturburu gisa."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Elm posta zaharra inportatzen ari da Evolution"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Inportatzen..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Itxaron"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s inportatzen %s gisa."
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Posta"
 
@@ -10910,39 +11163,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "%s posta-fitxategi lokala"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editatu iragazkiak"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11024,12 +11277,12 @@ msgstr "Posta-laburpenaren osagairako fabrika."
 msgid "Font Preferences"
 msgstr "Egutegi-hobespenak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontuak"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Egutegi-hobespenak"
@@ -11078,7 +11331,7 @@ msgstr "Propietateak..."
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11086,58 +11339,78 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Prestatu mezua"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Mezu berria"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Aurreko mezua"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Posta-mezu berria"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ezin da Evolution-en posta-osagaia hasieratu."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" - propietateak"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propietateak"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
@@ -11187,136 +11460,136 @@ msgstr "%d guztira"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Jarrait_u..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Bandera o_satuta"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Garbitu ban_dera"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplikatu iragazkiak"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Posta-zerrendaren araberako karpeta birtuala"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Posta-zerrendaren araberako iragazkia (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
@@ -11380,76 +11653,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution-en berri-editorea"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Ez ezabatu"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Ziur zaude kontua ezabatu nahi duzula?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Gaitu"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11459,30 +11723,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazkiaren araua"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11494,7 +11758,7 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11506,7 +11770,7 @@ msgstr ""
 "jaso edo prestatu ahal izateko.\n"
 "Orain konfiguratu nahi duzu?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11514,7 +11778,7 @@ msgstr ""
 "Identitatea konfiguratu behar duzu\n"
 "mezua idatzi ahal izateko."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11523,7 +11787,7 @@ msgstr ""
 "mezua idatzi ahal izateko."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11531,11 +11795,11 @@ msgstr ""
 "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
 "formatuko mezurik jaso nahi:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11543,7 +11807,7 @@ msgstr ""
 "Mezu honek ez du gairik.\n"
 "Ziur zaude bidali nahi duzula?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11551,11 +11815,11 @@ msgstr ""
 "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
 "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11565,15 +11829,11 @@ msgstr ""
 "goiburukoa gehituz.\n"
 "Hala ere bidali nahi duzu?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Kontua konfiguratu behar duzu mezu hau bidali ahal izateko."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11581,30 +11841,30 @@ msgstr ""
 "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
 "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 "Jatorrizko mezua:\n"
 "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Eraman mezua(k) hona"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiatu mezua(k) hemen"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11612,7 +11872,7 @@ msgstr ""
 "Zirriborroen karpetan gordetako mezuak bakarrik\n"
 "edita ditzakezu."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11620,32 +11880,32 @@ msgstr ""
 "Bidalitako mezuen karpetako mezuak bakarrik\n"
 "bidal ditzakezu berriro."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ez duzu mezurik hautatu"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Gorde mezua honela..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Gorde mezuak honela..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Irakurri gabeko mezuak dituen hurrengo karpetara joan?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11653,7 +11913,7 @@ msgstr ""
 "Karpeta honetan ez dago mezu gehiago.\n"
 "Hurrengo karpetara joan nahi duzu?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11665,7 +11925,7 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11674,28 +11934,28 @@ msgstr ""
 "Errorea iragazki-informazioa kargatzean:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Huts egin du mezua inprimatzean"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
@@ -11716,7 +11976,7 @@ msgstr "Azalpenik ez"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontaktu izengabea"
@@ -11737,20 +11997,21 @@ msgid "Add Signature"
 msgstr "Gorde sinadura"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Idatzi zure izena eta helbide elektronikoa behean. Nahi baduzu, \"aukerako\" "
 "eremuak bete gabe utz ditzakezu.\n"
 "Betetzen badituzu, datu horiek zuk bidaltzen dituzun mezuetan agertuko dira."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Idatzi behean posta hartzeko zerbitzariari buruzko informazioa. Ziur ez "
 "bazaude, galdetu sistemaren\n"
@@ -11761,24 +12022,23 @@ msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Idatzi posta bidaltzeko erabiliko duzun bidearen informazioa.  Ziur ez "
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Ia bukatu duzu posta konfiguratzeko prozesua.  Zehaztu dituzun identitatea, "
 "posta hartzeko \n"
@@ -11789,44 +12049,20 @@ msgstr ""
 "bakarrik erabiliko da kontu-izen hori."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "geroago"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Kontua"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Zerbitzua egiaztatzen"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
@@ -12088,237 +12324,225 @@ msgstr "Gorde eta itxi"
 msgid "Loading Images"
 msgstr "Kargatu iru_diak"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mezuaren goiburukoa"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP zerbitzaria:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Be_rri-iturriak"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ezin da mezua ireki"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Erantzun honi:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Lehenespenak"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Segurtasuna"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Hautatu PGP bitarra"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Zerbitzariaren konfigurazioa"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Lasterbideak"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Gorde sinadura"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Iturburua"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Iturburu-informazioa"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zehaztu fitxategi-izena:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12328,205 +12552,201 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Hurrengoa\"n."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ekialdea"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Kargatu beti irudiak saretik kanpo"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Autentifikazio-mota: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatikoki begiratu mezu berririk"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Egin bip mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Berretsi karpeta betiko borratzean"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML sinadura:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Lehenespenak"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Gaitu"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Birbidali honela"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Izen osoa:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML postan"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Lehenetsi _kontu hau"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Inoiz ez kargatu irudirik saretik kanpo"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP bide-izen bitarra:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jo soinua mezu berriak iristean"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, 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:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu mezuak gairik _gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Erantzun denei"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Erakutsi ordua honela"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Erabili konexio segurua (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Aldakorra"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_dagoen, maiztasun honekin"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "kolorea"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12550,202 +12770,212 @@ msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Gorde diskoan..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Gorde eranskina"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ikusi barnean (%s bidez)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Ezkutatu"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Kanpoko ikustailea"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Kargatu iru_diak"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Mezuaren edukia kargatzen"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "A_tzeratutako zereginak:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Gorde esteka honela (FIXME) "
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Gorde irudia honela..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Helbide okerra"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nork"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Nori"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Gorde mezua honela..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
 "giltzarrapoaren ikonoan."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP gunerako erakuslea (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "(%s) fitxategi lokalerako erakuslea"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "(%s)urruneko datuetarako erakuslea"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ez da birkonfiguratuko ez delako karpeta lokala"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12753,16 +12983,16 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12771,7 +13001,7 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12780,7 +13010,7 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Lanean"
 
@@ -12788,100 +13018,100 @@ msgstr "Lanean"
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Hala ere, mezua ongi bidali da."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12890,7 +13120,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12899,11 +13129,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12912,27 +13142,22 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Shell komandoa exekutatzen %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -12987,32 +13212,41 @@ msgstr "Bide-izena: %s, Mota: %s"
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Gogora_tu pasahitz hau"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
@@ -13039,7 +13273,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Izena:"
 
@@ -13069,7 +13303,7 @@ msgstr "Birbidalitako mezua - %s"
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Birbidalitako mezua"
 
@@ -13083,7 +13317,7 @@ msgstr "Karpeta birtuala konfiguratzen: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13096,94 +13330,97 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Gairik ez)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mezua"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -13216,48 +13453,48 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Joan aurrera"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Jarraitu"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Birbidali"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Aurrebista"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Jarraitzeko bandera"
@@ -13282,16 +13519,16 @@ msgstr "\"%s\" karpetan harpidetzen"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Karpeta"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
@@ -17754,11 +17991,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23174,8 +23413,8 @@ msgstr "Azalpenik ez"
 msgid "Mail summary"
 msgstr "Posta-laburpena"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
@@ -23193,15 +23432,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com-en Eguneko Hitza"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Eguneko aipuak"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Gehitu berri-iturria"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Idatzi gehitu nahi duzun berri-iturriaren URLa"
 
@@ -23213,27 +23452,27 @@ msgstr "Errorea RDF deskargatzean"
 msgid "News Feed"
 msgstr "Berri-iturriak"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Gehitu"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Zereginik ez"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Azalpenik ez)"
 
@@ -24505,7 +24744,8 @@ msgid "Tasks "
 msgstr "Zereginak "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Eguraldiaren ezarpenak"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24562,7 +24802,7 @@ msgstr "Erakutsi xehetasunak"
 msgid "Cancel Operation"
 msgstr "Utzi bertan behera eragiketa"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24576,20 +24816,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Bidalitakoen karpeta gisa"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Zirriborroak"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Bidalita"
 
@@ -24827,22 +25067,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Sortu karpeta berria"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Hautatutako karpetaren mota ez da baliozkoa\n"
-"eragiketa honetarako."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Sortu _karpeta berria...."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Berria..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(izengabea)"
 
@@ -24864,7 +25097,7 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
@@ -24895,21 +25128,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Fitxategi lokaletara bakarrik inporta dezakezu"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24918,11 +25147,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24931,17 +25160,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24950,31 +25179,31 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24982,24 +25211,24 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Inportatu"
 
@@ -25047,9 +25276,14 @@ msgstr "%s karpeta irekitzen"
 msgid "in \"%s\" ..."
 msgstr "Ireki honekin: %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Ezin izan da karpetaren izena aldatu: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
@@ -25067,8 +25301,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Ezin izan da Evolution Mailer Assistant interfazea abiarazi\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Berria"
@@ -25109,58 +25343,59 @@ msgstr "Joan karpeta honetara..."
 msgid "Select the folder that you want to open"
 msgstr "Hautatu ireki nahi duzun karpeta"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Sortu lasterbide berria"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Hautatu zein karpeta seinalatu behar duen lasterbideak:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(bat ere ez)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan "
 "egiteko."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution lineaz kanpo dago. Egin klik botoi honetan linean lan "
 "egiteko."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25172,12 +25407,12 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ezin da biltegi lokala ezarri -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25188,31 +25423,31 @@ msgstr ""
 "ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
 "duzu datu horiek berriro atzitzeko."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Errore generikoa"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Taldearen izena:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25221,107 +25456,117 @@ msgstr ""
 "Ziur zaude `%s' taldea kendu\n"
 "nahi duzula lasterbide-barratik?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Ez kendu"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Aldatu lasterbide-taldearen izena"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Jarri hautatutako lasterbide-taldeari izen hau:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Ikono txikiak"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Erakutsi lasterbideak ikono txiki gisa"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Ikono _handiak"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Erakutsi lasterbideak ikono handi gisa"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Talde berria..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Kendu talde hau..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Kendu lasterbide-talde hau"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Aldatu izena talde honi..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Aldatu izena lasterbide-taldeari"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ezkutatu lasterbide-barra"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Sortu lasterbide berria"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Sortu lasterbide berria"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Aldatu izena lasterbideari"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Jarri hautatutako lasterbideari izen hau:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Ireki lasterbide honekin estekatutako karpeta"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Ireki _leiho berrian"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Aldatu izena lasterbide honi"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Kendu"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Errorea lasterbideak gordetzean."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Lasterbideak"
 
@@ -25330,55 +25575,55 @@ msgstr "Lasterbideak"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Errorerik ez"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Badago lehendik izen hori duen karpeta bat"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Adierazitako karpeta-mota ez da baliozkoa"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "S/Iko errorea"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Ez dago karpeta sortzeko behar adina leku"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Karpeta ez dago hutsik"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Adierazitako karpeta ez da aurkitu"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funtzioa ez dago inplementatuta biltegiratze honetan"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Eragiketa ez da onartzen"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Adierazitako mota ez da onartzen biltegiratze honetan"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Adierazitako karpeta ezin da aldatu edo kendu"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Karpeta bat ezin da bere azpikoen ume bihurtu."
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Ezin da izen horretako karpetarik sortu"
 
@@ -25433,63 +25678,63 @@ msgstr ""
 "Aktibazio-sistemak eman duen errorea:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
@@ -25513,6 +25758,26 @@ msgstr "Ostalaria"
 msgid "The following connections are currently active:"
 msgstr "Konexio hauek aktibo daude:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Egutegia"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktuak "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Posta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Zereginak"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Karpeta-izena:"
@@ -25525,6 +25790,34 @@ msgstr "Karpeta-mota:"
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Sortu _karpeta berria...."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Karpeta-izena:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Zer_bitzariaren izena:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Erabiltzaile-izena:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
@@ -25621,15 +25914,15 @@ msgstr "Ez galdetu berriro"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution "
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ixten ari da..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25662,7 +25955,7 @@ msgstr ""
 "Espero dugu gogokoa izango duzula gure lan gogorraren emaitza,\n"
 "eta atsegin handiz gauzkazu zure ekarpenen zain!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -25671,37 +25964,37 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution Taldea\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ez galdetu berriro"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Desgaitu splash pantaila"
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25710,7 +26003,7 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ezin da Bonobo osagaiaren sistema hasieratu."
 
@@ -25745,113 +26038,107 @@ msgstr "Kopiatu hautapena"
 msgid "Copy to Folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Sortu kontaktu berria"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Sortu kontaktu-zerrenda berria"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Ezabatu hautatutako kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Eraman kontaktua(k) beste karpeta batera..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbela"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "_Inprimatzeko aurrebista"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Gorde hautatutako kontaktuak VCard gisa."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Hautatu kontaktu guztiak"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Bidali mezua hautatutako kontaktuei."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Bidali hautatutako kontaktuak beste norbaiti."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Utzi kargatzeari"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Ekintzak"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktuen zerrenda"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Birbidali kontaktua..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Gorde VCard gisa"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Bilatu kontaktuak"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Hautatu denak"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
@@ -25895,11 +26182,6 @@ msgstr "_Hilabetea"
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "_Inprimatzeko aurrebista"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
@@ -25932,7 +26214,7 @@ msgstr "Astea"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Itxi"
 
@@ -25945,7 +26227,7 @@ msgid "Delete this item"
 msgstr "Ezabatu elementu hau"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Tresna-barra nagusia"
 
@@ -25957,8 +26239,8 @@ msgstr "Inprimatutako elementuaren aurrebista ikusi"
 msgid "Print this item"
 msgstr "Inprimatu elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Gorde"
 
@@ -25983,9 +26265,9 @@ msgstr "Gorde elementu hau diskoan"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "Fi_txategia"
 
@@ -25995,7 +26277,7 @@ msgstr "Inprimatu _gutun-azala..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Gorde hone_la..."
 
@@ -26009,8 +26291,8 @@ msgstr "Bidali _mezua kontaktuari..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Gorde"
 
@@ -26107,26 +26389,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Mezu berria"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Mezua karpetan gordetzen"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Erakutsi mezu-aurrebistaren leihoa"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Karpeta birtualen editorea..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Iragazkiak..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Au_rrebistako panela"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Egin karpeten harpidetza..."
 
@@ -26223,7 +26515,7 @@ msgstr "Hari bateko mezuen zerrenda"
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Karpeta"
 
@@ -26477,177 +26769,192 @@ msgstr "Irakurri gabeko aurreko mezua"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Zereginaren erantzuna"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Karpeta guztietan begiratu mezurik dagoen"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Birbidali mezua"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Joan"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "I_zena aldatu..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Itxi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "I_kusi"
 
@@ -26675,169 +26982,161 @@ msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 msgid "For_mat"
 msgstr "For_matua"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "_HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Bar_neko testu-fitxategia..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Txertatu fitxategia mezuan testu gisa"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Txertatu testu-fitxategia..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ireki"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Ireki fitxategia"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP enkriptatzea"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP sinadura"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME enkriptatzea"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME sinadura"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gorde honela"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Gorde _zirriborroa"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Gorde karpetan..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Gorde uneko fitxategia beste izen batekin"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Gorde mezua adierazitako karpetan"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Bidali"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Bidali _geroago"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Bidali _geroago"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Bidali mezua HTML formatuan"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Bidali mezua geroago"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Bidali mezua orain"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Erakutsi / ezkutatu eranskinak"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Erakutsi _eranskinak"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Erakutsi eranskinak"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Sinatu mezu hau zure PGP gakoarekin"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC eremua erakutsi edo ezkutatzen du"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC eremua erakutsi edo ezkutatzen du"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "'Nork' eremua erakutsi edo ezkutatzen du"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Eranskina..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc eremua"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc eremua"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "Ezaba_tu dena"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "'Nork' e_remua"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Txertatu"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "_HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Laguntza"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Gorde sinadura"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Gehitu karpeta harpidetutako karpeten zerrendan"
@@ -26933,171 +27232,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Gehitu _lasterbide-barran"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Aldatu karpeta honen izena"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiatu karpeta hau"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Sortu _karpeta berria...."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Sortu karpeta honen esteka lasterbide-barran"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Sortu karpeta berria"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Sortu lasterbide berria"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Sortu karpeta berria"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Ezabatu karpeta hau"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Bistaratu beste karpeta bat"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Irte_n"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _leihoa"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Programatik irten"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Inportatu datuak beste programa batzuetatik"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Eraman karpeta hau beste leku batera"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Sortu _karpeta berria...."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Ireki leiho berrian"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Ireki karpeta hau beste leiho batean"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot-en ezarpenak..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilarako mezuak eta hartu mezu berriak"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Posta-konfigurazioa"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Bidali akatsen berri-ematea"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Txandakatu"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Erakutsi/ezkutatu karpeta-barra "
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Erakutsi/ezkutatu lasterbide-barra "
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Bistaratu hautatutako karpeta"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Xiimian Evolution-i buruzko MEGak (FAQ)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Ximian E_volution-i buruz..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "Ko_piatu..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Karpeta-barra"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Karpeta"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Inportatu..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Lekuz aldatu..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "Berr_ia"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Kar_peta berria"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot-en ezarpenak..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Egutegi-hobespenak"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Lasterbidea"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "La_sterbide-barra"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Lasterbidea"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Inprimatu laburpena"
@@ -27111,17 +27441,40 @@ msgid "Reload the view"
 msgstr "Berritu ikuspegia"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Helbide-txartelak"
+#, fuzzy
+msgid "By _Company"
+msgstr "Enpresaren arabera"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Enpresaren arabera"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Helbide-txartelak"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonoen zerrenda"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Astearen ikuspegia"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Egunaren ikuspegia"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Hilabetearen ikuspegia"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Lan-astearen ikuspegia"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Bidalitakoen karpeta gisa"
@@ -27146,13 +27499,19 @@ msgstr "Gaiaren arabera"
 msgid "Messages"
 msgstr "Mezuak"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Kategoria hau dutenak"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Zeregina"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27304,11 +27663,11 @@ msgstr "Karaktere-kodeketa"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Bilaketa-editorea"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Gorde bilaketa"
 
@@ -27348,21 +27707,21 @@ msgstr "Mezua"
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Bilatu orain"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Garbitu"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Bilatu orain"
 
@@ -27376,18 +27735,171 @@ msgstr "Helbide-liburu pertsonalaren zerbitzaria"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Egutegi pertsonalaren zerbitzaria; egutegi-fabrika"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): ezin izan da GNOME-VFS hasieratu"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): ezin izan da GNOME hasieratu"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution-ek ezin du lortu helbide-liburuaren biltegi lokala.\n"
+#~ "evolution-addressbook osagaia kraskatu delako izan daiteke.\n"
+#~ "Problema hobeto aztertu eta konponbidea aurkitu ahal izan\n"
+#~ "dezagun bidali mezua mesedez Jon Trowbridge-ri <trow@ximian.com> \n"
+#~ "errorea nola gertatu den ahalik eta xehetasun handienaz kontatuz. \n"
+#~ "  Eskerrik asko."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution-ek ezin du helbide-liburuaren biltegi lokala eskuratu.\n"
+#~ "Egoera normalean, ez luke sekula gertatu beharko.\n"
+#~ "Evolution-etik irten eta berriro sartu beharko duzu\n"
+#~ "arazoa konpontzeko."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Lekuz aldatu..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Bileraren egoera aldatu egin da. Bertsio eguneratua bidali?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Ezabatu _hitzordu hau"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Jaulkitzailea: %s\n"
+#~ "Gaia: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL protokolo-errorea"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "S/Iko errorea: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Ongietorri-erantzunaren errorea: %s: beharbada ez da ezinbestekoa"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO eskaera denboraz kanpo: %s: ez da ezinbestekoa"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO erantzunaren errorea: %s: ez da ezinbestekoa"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT eskaera denboraz kanpo: %s: ez da ezinbestekoa"
+
+#~ msgid "Insert File"
+#~ msgstr "Txertatu fitxategia"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Data baliogabea aukeratu duzu."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Mezuaren data iragazkia exekutatzen den edo\n"
+#~ "karpeta birtuala irekitzen den orduarekin\n"
+#~ "konparatuko da."
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Enpresakoa"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution-en berri-editorea"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Ziur zaude kontu berri hau ezabatu nahi duzula?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Kontua konfiguratu behar duzu mezu hau bidali ahal izateko."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP zerbitzaria:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Be_rri-iturriak"
+
+#~ msgid "Source"
+#~ msgstr "Iturburua"
+
+#~ msgid "Source Information"
+#~ msgstr "Iturburu-informazioa"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Gorde diskoan..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Gorde mezua honela..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Shell komandoa exekutatzen %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Sortu karpeta berria"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Hautatutako karpetaren mota ez da baliozkoa\n"
+#~ "eragiketa honetarako."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Fitxategi lokaletara bakarrik inporta dezakezu"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktuen zerrenda"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Bar_neko testu-fitxategia..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Txertatu fitxategia mezuan testu gisa"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Txertatu testu-fitxategia..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Bidali _geroago"
+
+#~ msgid "Send _later"
+#~ msgstr "Bidali _geroago"
+
+#~ msgid "Send the message later"
+#~ msgstr "Bidali mezua geroago"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot-en ezarpenak..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Helbide-liburuaren iturburuak"
@@ -27547,10 +28059,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Sinadura-fitxategia:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Ezabatu dena sinadura izan ezik"
 
@@ -27867,9 +28375,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Posta biltegiratzeko karpeta (barnekoa)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Ezin izan da biltegiarekin konektatu: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "Sortu karpeta birtuala bilaketatik"
 
@@ -27915,9 +28420,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "_Organization:"
 #~ msgstr "E_rakundea:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Gogora_tu pasahitz hau"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Bidali mezuak HTML formatuan lehenespen gisa."
 
@@ -27975,15 +28477,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Sortu _bilera berria"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Sortu hitzordu berria"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Sortu bilera-eskaera berria."
-
-#~ msgid "Create a new task"
-#~ msgstr "Sortu zeregin berria"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Sortu egun osoko gertaera"
 
@@ -28035,9 +28528,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ msgid "New Appointment"
 #~ msgstr "Hitzordu berria"
 
-#~ msgid "New Message"
-#~ msgstr "Mezu berria"
-
 #~ msgid "Needs Reply"
 #~ msgstr "Erantzuna behar du"
 
@@ -28345,9 +28835,6 @@ msgstr "init_bonobo(): ezin izan da Bonobo hasieratu"
 #~ "Honek POP zerbitzariarekin konektatuko zaitu eta Kerberos 4 erabiliko du "
 #~ "bertan autentifikatzeko."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Ezin izan da KPOP zerbitzarian autentifikatu: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Ezezaguna)"
 
diff --git a/po/fi.po b/po/fi.po
index 1e74e76ecd..fc37ad6d06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-11-06 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nimi"
@@ -342,46 +342,46 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Etsit��n..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Ladataan..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktit"
 
@@ -493,23 +493,32 @@ msgstr "LDAP-palvelin"
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Luo uusi kontakti"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Uusi kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktiluettelo"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Uusi kontakti"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakti"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Luo uusi kontaktiluettelo"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -529,24 +538,24 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs:n alustus ei onnistunut"
 
@@ -554,18 +563,18 @@ msgstr "gnome-vfs:n alustus ei onnistunut"
 msgid "Other Contacts"
 msgstr "Muut kontaktit"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -573,50 +582,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "loppuu merkkijonoon"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "S�hk�posti 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mik� tahansa kentt� sis�lt��"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -739,7 +748,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Osoitekirjal�hteet"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -829,8 +838,8 @@ msgstr "Palvelimen asetukset"
 msgid "Mappings"
 msgstr "Reunukset"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Joka"
@@ -882,8 +891,8 @@ msgstr "_Etsi viesti�"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "Etsit��n..."
@@ -1073,15 +1082,15 @@ msgid "Using email address"
 msgstr "_T�m� on postitusosoite"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lis��"
 
@@ -1126,12 +1135,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Muokkaa"
@@ -1245,10 +1254,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Poista"
 
@@ -1277,33 +1286,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Nimet�n kontakti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "L�hett�j�kentt� sis�lt��"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Valitse nimet"
@@ -1325,15 +1316,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Siirr�..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Ryhm�:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Kansio:"
 
@@ -1444,11 +1430,12 @@ msgstr "Haluaa s�hk�postit HTML-muodossa"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -2683,7 +2670,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -2742,7 +2729,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
@@ -2770,21 +2757,21 @@ msgid "Error getting book view"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -2792,8 +2779,8 @@ msgstr "Tuntematon virhe"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr ""
 
@@ -2810,7 +2797,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2833,48 +2820,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Kansiota `%s' ei ole olemassa."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Virhe kortin lis��misess�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Virhe kortin poistossa"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Kirjoita viesti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Kirjoita viesti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2882,22 +2874,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ei kortteja"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ei kortteja"
@@ -2970,7 +2962,7 @@ msgstr "Osoitekirja"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr ""
 
@@ -3010,7 +3002,7 @@ msgid "Pilot Settings..."
 msgstr "_S�hk�postiasetukset..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
@@ -3019,8 +3011,8 @@ msgid "Send Message to Contact"
 msgstr "L�het� viesti kontaktille"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tulosta"
@@ -3040,7 +3032,7 @@ msgid "Move to folder..."
 msgstr "_Siirr� kansioon..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
@@ -3051,20 +3043,20 @@ msgid "Copy"
 msgstr "Kopioi"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Liit�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Poista"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Nykyinen n�kym�"
@@ -3221,7 +3213,7 @@ msgstr "Reunukset"
 msgid "Number of columns:"
 msgstr "Sarakkeiden m��r�:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Asetukset"
 
@@ -3311,26 +3303,26 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Matala"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "M��rittelem�t�n"
@@ -3453,11 +3445,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3465,13 +3457,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varoitus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3482,7 +3474,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�l� kysy t�t� en�� uudelleen"
@@ -3512,7 +3504,7 @@ msgstr "Kuvaus:"
 msgid "Comment contains"
 msgstr "Kommentti sis�lt��"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3524,7 +3516,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3548,17 +3540,17 @@ msgstr "%A, %e %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Henkil�kohtainen"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Luottamuksellinen"
@@ -3583,7 +3575,7 @@ msgstr "I"
 msgid "W"
 msgstr "L"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3591,30 +3583,30 @@ msgstr "Pe"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3622,60 +3614,59 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "M��rittelem�t�n"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Kyll�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ei"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 #, fuzzy
 msgid "Day View"
 msgstr "_N�yt�"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 #, fuzzy
 msgid "Work Week View"
 msgstr "Ty�viikk_o"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 #, fuzzy
 msgid "Week View"
 msgstr "Viikko"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 #, fuzzy
 msgid "Month View"
 msgstr "Kuukausi"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -3683,12 +3674,12 @@ msgstr "Kalenteri"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Teht�v�t"
 
@@ -3696,44 +3687,62 @@ msgstr "Teht�v�t"
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Uusi tapaaminen"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Tapaaminen"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Luo uusi tapaaminen"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Luo uusi teht�v�"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Teht�v�"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Luo uusi teht�v�"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Uusi tapaaminen"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Tapaaminen"
+msgid "Create a new all-day appointment"
+msgstr "Luo uusi tapaaminen"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3804,7 +3813,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "p�iv��"
 
@@ -3813,11 +3823,13 @@ msgstr "p�iv��"
 msgid "extra times every"
 msgstr "P�ivit� joka"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuutti"
 
@@ -3952,7 +3964,7 @@ msgstr "Muistutukset"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -3982,7 +3994,7 @@ msgstr ""
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -4174,7 +4186,7 @@ msgid "_Fri"
 msgstr "Pe"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_General"
 msgstr "Yleiset"
@@ -4223,21 +4235,35 @@ msgstr "Ke"
 msgid "before every appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Haluatko todella poistaa teht�v�n '%s'?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
@@ -4308,61 +4334,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Tiedostojen p�ivitys ei onnistunut"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Teht�v� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4576,7 +4602,7 @@ msgid "Member"
 msgstr "Joulukuu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4588,7 +4614,7 @@ msgstr "Rooli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
@@ -4674,7 +4700,7 @@ msgstr ""
 msgid "first"
 msgstr "_Etunimi:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunti"
 
@@ -4698,7 +4724,7 @@ msgstr "Liit�"
 msgid "Other Date"
 msgstr "Muu faksi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "p�iv�"
 
@@ -4798,20 +4824,27 @@ msgstr "Valmis"
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "Lis�� toiminto"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Tila:"
 
@@ -4826,7 +4859,7 @@ msgstr ""
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4895,82 +4928,82 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Avaa"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Tallenna nimell�..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "L_iit�"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Ladataan kalenteria"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Poista teht�v�"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -4979,8 +5012,8 @@ msgstr ""
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Valmis"
 
@@ -5008,11 +5041,9 @@ msgstr "Prioriteetti"
 msgid "Start Date"
 msgstr ""
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kuvaus"
 
@@ -5054,111 +5085,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Uusi t_apaaminen"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Uusi koko p�_iv�n tapahtuma"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Uusi teht�v�"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Siirry _p�iv��n..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Palvelimen asetukset"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Tallenna _nimell�..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Varjostus"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "_Kontaktit..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
@@ -5208,7 +5238,7 @@ msgstr "Valmis"
 msgid "Task Due: <b>"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Pakolliset tiedot"
@@ -5219,363 +5249,370 @@ msgstr "Pakolliset tiedot"
 msgid "iCalendar Error"
 msgstr "Kalenteri"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "Tuntematon virhe"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Maant. sijainti: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Tila:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "Hyv�ksy "
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Poistettu"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Valitse toiminto"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Peruuta tapaaminen"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Teht�v�t"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "Vastaa"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Peruuta operaatio"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Hae viestist�"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Edellinen viesti"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddya ei voitu ajaa."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Kohdistimen lataaminen ep�onnistui\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Valmis"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "L�hetetty"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Valitse kansio"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Valitse kansio"
@@ -5622,7 +5659,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr "Autopuhelin"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "Pakolliset tiedot"
@@ -5637,60 +5674,54 @@ msgid "Non-Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "Ryhm�n nimi:"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "Paperil�hde:"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "Lis�� toiminto"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "Poistettu"
@@ -5782,49 +5813,46 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Poista valitut kontaktit"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "P_oista t�m� tapaaminen"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5835,11 +5863,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Synkronoidaan kansiota"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -5896,58 +5929,63 @@ msgstr "Lokakuu"
 msgid "September"
 msgstr "Syyskuu"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Tiedoksi"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Valinnaiset tiedot"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "L�hteen tiedot"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Pakolliset tiedot"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Teht�v�t"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "vuotta"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobon alustus ei onnistunut"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
@@ -6179,9 +6217,8 @@ msgid "Print Calendar"
 msgstr "Tulosta kalenteri"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6210,8 +6247,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�l� kysy t�t� en�� uudelleen"
@@ -6265,17 +6302,29 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s ep�onnistui\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Muistutus"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenteri"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6284,112 +6333,112 @@ msgstr ""
 "Evolution l�ysi Pinen s�hk�postitiedostoja.\n"
 "Haluatko tuoda n�m� Evolutioniin?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalenteri"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8019,72 +8068,80 @@ msgstr "Poistetaan kansiota %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Virhe j�sennett�ess� suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Virhe suoritettaessa suodatinta: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Haetaan viesti� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Viesti� ei voida avata"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Virhe viestin %d kohdalla"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synkronoidaan kansiota"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8137,7 +8194,7 @@ msgstr "L�hetet��n viesti�"
 msgid "Copying messages"
 msgstr "L�hetet��n viesti�"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8145,47 +8202,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus POP-palvelimelta: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Vastaanottajia ei ole m��ritelty"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8193,18 +8250,18 @@ msgid ""
 "%.*s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Viestin salauksen purkaminen ep�onnistui."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "V�liaikaistiedostoa ei voitu luoda: %s"
@@ -8230,22 +8287,22 @@ msgid "Could not lock '%s'"
 msgstr "Lukitus ep�onnistui: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8304,11 +8361,15 @@ msgstr "Virhe kirjoitettaessa v�liaikaista viestitiedostoa: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Virhe kopioitaessa viestin v�liaikaistiedostoa: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8431,7 +8492,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8606,26 +8667,125 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Allekirjoitustiedosto:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Virhe %s:n lataamisessa"
+
+#: camel/camel-tcp-stream-openssl.c:593
+msgid "Out of memory"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Invalid purpose"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8634,16 +8794,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8658,32 +8830,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' j�sent�minen ep�onnistui"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Virhe %s:n k�ynnistyksess�"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Etsi uusia viestej� kaikista kansioista"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -8691,12 +8868,12 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8725,40 +8902,40 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Etsit��n muuttuneita viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "T�t� viesti� ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8767,10 +8944,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "V�limuistihakemistoa ei voitu avata: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Viestin salauksen purkaminen ep�onnistui."
@@ -8783,7 +8960,7 @@ msgstr "Tarkastetaan onko uutta s�hk�postia"
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestej� kaikista kansioista"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Kansiot"
 
@@ -8814,7 +8991,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Salasana"
 
@@ -8822,70 +8999,74 @@ msgstr "Salasana"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa k�ytt�en."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Todennus ep�onnistui."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Kansiota `%s' ei ole olemassa."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8893,31 +9074,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -8940,7 +9127,9 @@ msgid "Local delivery"
 msgstr "Paikalliset kansiot"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8966,12 +9155,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8982,40 +9171,40 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimet� seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9074,7 +9263,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9110,26 +9299,26 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Tarkastetaan onko uutta s�hk�postia"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Etsit��n uusia viestej�"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9174,35 +9363,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9219,13 +9408,13 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9233,54 +9422,54 @@ msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr ""
 "Tiedoston %s poistaminen ep�onnistui:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9428,48 +9617,48 @@ msgstr "Peruuta"
 msgid "Operation failed: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Haetaan POP-yhteenvetoa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Peruutettu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viesti� %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Tuntematon virhe"
@@ -9487,7 +9676,7 @@ msgstr "J�t� viestit palvelimelle"
 msgid "Delete after %s day(s)"
 msgstr "Poista %s:n p�iv�n kuluttua"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9508,6 +9697,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9517,50 +9711,52 @@ msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "Palveli_meni vaati todennuksen"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP-komento ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/O-virhe"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Yhdist�minen palvelimeen ep�onnistui."
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9585,35 +9781,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Viestin l�hett�minen ep�onnistui: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9721,41 +9917,40 @@ msgstr "V�liaikainen todennusvirhe"
 msgid "Authentication required"
 msgstr "Todennus vaaditaan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Palveli_meni vaati todennuksen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9763,89 +9958,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-palvelin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "L�hetet��n viesti�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Muu virhe"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP-todennus"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9853,86 +10048,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 tavy"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u tavua"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Lis�� liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Lis�� viestiin liitetiedoston"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Tiedoston %s liitt�minen ep�onnistui: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Tiedoston %s liitt�minen ep�onnistui: ep�tavallinen tiedosto"
@@ -9950,56 +10145,60 @@ msgid "MIME type:"
 msgstr "MIME-tyyppi:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr ""
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "L�hett�j�:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Vastausosoite:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "L�hett�j�:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Aihe:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Vastaanottaja:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Kopiot:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Anna osoitteet joihin l�hetet��n kopio viestist� (Cc)"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Piilokopiot:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10007,17 +10206,25 @@ msgstr ""
 "Anna osoitteet joihin l�hetet��n kopiot viestist� ilman ett� muut "
 "vastaanottajat n�kisiv�t t�t� (Bcc)"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Portti:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Liit� tiedosto"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Allekirjoitustiedoston luonti ep�onnistui."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10026,48 +10233,48 @@ msgstr ""
 "Tiedoston %s lukeminen ep�onnistui:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Varoitus!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Virhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10076,7 +10283,7 @@ msgstr ""
 "Virhe tallennettaessa tiedostoa automaattisesti: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10084,7 +10291,7 @@ msgstr ""
 "Ximian Evolution on l�yt�nyt tallentamattomia tiedostoja edelliselt� \n"
 "istunnolta. Haluatko koettaa niiden palauttamista?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10094,49 +10301,45 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Liit� tiedosto"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Tallenna allekirjoitus"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (oletus)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10144,9 +10347,9 @@ msgstr ""
 "Viestimuokkain -ikkunan luominen ep�onnistui:\n"
 "HTML-muokkainkomponentin k�ynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10209,8 +10412,8 @@ msgstr "Otsikko sis�lt��"
 msgid "Subject does not contain"
 msgstr "Otsikko ei sis�ll�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10218,12 +10421,11 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Muista t�m� salasana"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10322,246 +10524,268 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "vuosi"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "vuotta"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekuntia"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "kuukausi"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuutti"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "kuukautta"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "tunti"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "viikko"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "viikkoa"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "tunti"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "kuukausi"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuutti"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "kuukautta"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekuntia"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "vuosi"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "vuotta"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Olet unohtanut valita p�iv�n."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Olet valinnut ep�kelvon p�iv�n."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr ""
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Valitse aika johon verrataan"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "nyt"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr ""
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Valitse aika johon verrataan"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Tyylin nimi:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' ei ole hakemisto."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Valitse toiminto"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Sitten"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Lis�� toiminto"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Ty�viikk_o"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr ""
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "j�lkeen"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Muuta t�m�n kansion nime�"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "S��nn�n nimi: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Nimet�n"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "kaikki ehdot t�ytet��n"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "mik��n ehdoista t�yttyy"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Lis�� ehto"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "tulevat"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "l�htev�t"
 
 #: filter/filter.glade.h:1
-msgid "Edit Filters"
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Tulevat"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "L�htev�t"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 msgstr ""
 
 #: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10588,42 +10812,42 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Yritys"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "sis�lt��"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "L�hetetty"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ei sis�ll�"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ei lopu merkkijonoon"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ei ole olemassa"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ei ole olemassa"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
@@ -10645,91 +10869,87 @@ msgid "ends with"
 msgstr "loppuu merkkijonoon"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "j�lkeen"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "ennen"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Viestin otsikko"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Siirr� kansioon"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "L�het� viesti kontaktille"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Puola"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lue"
 
@@ -10745,57 +10965,87 @@ msgstr ""
 msgid "Replied to"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burundi"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "on suurempi kuin"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "on pienempi kuin"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "L�hett�j�"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Yritys"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Koko (kt)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "alkaa merkkijonolla"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Yhdysvallat"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "S��nn�t"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Lis�� s��nt�"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Muokkaa s��nt��"
 
@@ -10803,12 +11053,12 @@ msgstr "Muokkaa s��nt��"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Muuta t�m�n kansion nime�"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10816,31 +11066,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Tuodaan..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Odota, ole hyv�"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr ""
 
@@ -10901,39 +11151,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Roskakori"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Asetukset"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11010,12 +11260,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Tilit"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11064,67 +11314,87 @@ msgstr "Ominaisuudet..."
 msgid "Change this folder's properties"
 msgstr "Muuta t�m�n kansion ominaisuuksia"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Varoitus: Muutettu viesti"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Seuraava viesti"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Kirjoita viesti"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Edellinen viesti"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Seuraava viesti"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Peruutetaan..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Kansion \"%s\" ominaisuudet"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Ominaisuudet"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
@@ -11174,136 +11444,136 @@ msgstr "%d yhteens�"
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Luo viestist� suodatin"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Suodata _l�hett�j�n mukaan"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Tulosta viesti..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Vastaa l�hett�j�lle"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_V�lit�"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Valmis"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Kalenteri"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Merkitse t�rke�ks_i"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lis�� l�hett�j� osoitekirjaan"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Toteuta suodattimet"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestist� s��nt�"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Suodata postituslistan mukaan"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Suodata postituslistan mukaan (%s)"
@@ -11366,76 +11636,67 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolutionin keskusteluryhm�muokkain"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Is�nt�palvelin:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "K�ytt�j�t_unnus:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa t�m�n tilin?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "�l� poista"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Poistetaanko tili todella?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "�l� k�yt�"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "K�yt�"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Tilin nimi:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11444,30 +11705,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Suodattimet"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "L�hett�j�:"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "S�hk�posti 2"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Lis�� suodatuss��nt�"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11475,7 +11736,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11487,31 +11748,31 @@ msgstr ""
 "vastaanottaa tai kirjoittaa viestej�.\n"
 "Haluatko tehd� asetukset nyt?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "L�het� s�hk�postia"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11519,61 +11780,57 @@ msgstr ""
 "Viestill� ei ole aihetta.\n"
 "L�hetet��nk� toedella?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Sinuun tulee m��ritell� vastaanottajat ennen t�m�n viestin l�hett�mist�."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Sinun tulee luoda tili ennen kuin voit l�hett�� t�t� viesti�."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Tuntematon virhe"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Siirr� viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11581,7 +11838,7 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11589,39 +11846,39 @@ msgstr ""
 "Voit l�hett�� uudelleen vain\n"
 "\"L�hetetyt\"-kansiossa olevia viestej�."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Haluatko todella l�hett�� kaikki %d viesti� uudelleen?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ei viestej� valittuna"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Kirjoita tiedoston yli?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Tallenna viesti nimell�..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Tallenna viestit nimell�..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "N�yt� seuraava lukematon viesti"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11629,35 +11886,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Haetaan viesti� %d / %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Viestin tulostus ep�onnistui"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11678,7 +11935,7 @@ msgstr "Kuvaus:"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nimet�n kontakti"
@@ -11701,15 +11958,14 @@ msgstr "Tallenna allekirjoitus"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11719,60 +11975,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin tilimuokkain"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Ty�viikk_o"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "j�lkeen"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Tili"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12027,441 +12257,425 @@ msgstr "Tallenna ja sulje"
 msgid "Loading Images"
 msgstr "Lataa k_uvat"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Viestin otsikko"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Viestit"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP-palvelin"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "NNTP-palvelin"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Valinnaiset tiedot"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Valitse v�ri"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Viesti� ei voida l�hett��: vastaanottajia ei ole m��ritelty."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tulosta valitut kontaktit"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Viesti� ei voida avata"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Muista t�m� salasana"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Vastausosoite:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Otetaan vastaan s�hk�postia"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Hakuasetukset"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Muista t�m� salasana"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Pakolliset tiedot"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "_Oletukset"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Turvallisuus"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Valitse PGP-ohjelma"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "L�hetet��n s�hk�postia"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "L�hetettyjen kansio:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "L�hetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Palvelimen asetukset"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Oikotiet"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Tallenna allekirjoitus"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "L�hde"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "L�hteen tiedot"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tyylin nimi:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Todennustapa:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "K�yt�"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_V�litet� viesti"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Koko nimi:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "L�het� HTML-postia?"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Tee t�st� _oletustilini"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP-ohjelman polku:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Tuleva posti"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Vastaa kaikille"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Turvalli_suus"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "Turvalli_suus"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "L�htev� posti"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "N�yt�"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-allekirjoitus:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "K�yt� salattua yhteytt� (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Joka"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "Kuvaus:"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12485,227 +12699,237 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "V�liaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr ""
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Tallenna liite"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Piilota"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Lataa k_uvat"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Ladataan viestin sis�lt��"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Avaa linkki selaimessa"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopioi linkin sijainti"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Tallenna linkki nimell�"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Tallenna kuva nimell�..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "P�iv�ys"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ep�kelpo osoite"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "L�hett�j�"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Vastausosoite:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Kopiot:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Piilokopiot:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "_Matkapuhelin"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Tallenna viesti nimell�..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Et voi muuttaa ei-paikallisen kansion tyyppi�."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Synkronoidaan kansiota"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12713,145 +12937,140 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "L�hetet��n \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "L�hetet��n viesti� %d / %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "V�litetyt viestit"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viesti� %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Haetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Tallennetaan %d viesti(�)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Hakuasetukset"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Etsi"
 
@@ -12906,34 +13125,42 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tyyppi:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "L�het� & Vastaanota postia"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Peruuta"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "P�ivitet��n..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Muista t�m� salasana"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "Salasana"
@@ -12961,7 +13188,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -12991,7 +13218,7 @@ msgstr "V�litetty viesti - %s"
 msgid "Forwarded message"
 msgstr "V�litetty viesti"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "V�litetty viesti"
 
@@ -13005,7 +13232,7 @@ msgstr "Poistetaan kansiota %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13014,97 +13241,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 #, fuzzy
 msgid "VFolders"
 msgstr "Kansiot"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Kansiot"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Kansio"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Ei aihetta)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Viesti"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "N�hty"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "N�kem�tt�"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "T�n��n %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -13138,47 +13368,47 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Peruutettu"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "V�lit�"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "L�hteen tiedot"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "V�lit�"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Esikatselu:"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13202,16 +13432,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kansio"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
@@ -18061,11 +18291,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23967,8 +24197,8 @@ msgstr "Kuvaus:"
 msgid "Mail summary"
 msgstr "Postin yhteenveto"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
@@ -23986,15 +24216,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24007,26 +24237,26 @@ msgstr "<b>Virhe ladattaessa RDF:��</b>"
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Lis��"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "N�yt� kaikki"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Ei teht�vi�"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "Kuvaus:"
@@ -25317,8 +25547,9 @@ msgid "Tasks "
 msgstr "Teht�v�t "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Asetukset"
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -25375,7 +25606,7 @@ msgstr "N�yt� yksityiskohdat"
 msgid "Cancel Operation"
 msgstr "Peruuta operaatio"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25387,21 +25618,21 @@ msgstr "Kansion hakeminen ei onnistu: %s: %s"
 msgid "Add a Folder"
 msgstr "Valitse kansio"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Luonnos"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "L�htev�t"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "N�kem�tt�"
@@ -25614,20 +25845,15 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Luo _uusi kansio"
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Uusi..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Nimet�n)"
 
@@ -25644,7 +25870,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -25670,104 +25896,100 @@ msgstr ""
 msgid "Select importer"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Kansiota `%s' ei ole olemassa."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Virhe %s:n k�ynnistyksess�"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Virhe %s:n lataamisessa"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tiedoston tyyppi:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "L�hett�j�:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Tuo"
 
@@ -25813,8 +26035,15 @@ msgstr "Poistetaan kansiota %s"
 msgid "in \"%s\" ..."
 msgstr "L�hetet��n \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr ""
+"Tiedoston %s poistaminen ep�onnistui:\n"
+"%s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+msgid "Cannot find the specified shared folder."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
@@ -25829,8 +26058,8 @@ msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Uusi"
@@ -25874,56 +26103,57 @@ msgstr "Siirry kansioon..."
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
-msgstr ""
-
 #: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
+msgstr "Luo uusi kontakti"
+
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "Ty�skentele linjoilla"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Ty�skentele poissa linjoilta"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "(Ei nime�)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25931,12 +26161,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25944,140 +26174,150 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Ryhm�n nimi:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "�l� poista"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Nime� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Oikotieryhm�n uusi nimi:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Pienet kuvakkeet"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "N�yt� oikotiet pienin� kuvakkeina"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Suuret kuvakkeet"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "N�yt� oikotiet suurina kuvakkeina"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Uusi ryhm�..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Luo uusi oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Poista t�m� _ryhm�..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Poista t�m� oikotieryhm�"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Nime� t�m� ryhm� uudelleen..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Nime� t�m� oikotieryhm� uudelleen"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Piilota oikotiepalkki"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Luo uusi oikotieryhm�"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Luo uusi oikotieryhm�"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Nime� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Oikotien uusi nimi:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Avaa t�m�n oikotien osoittama kansio"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Avaa uudessa _ikkunassa"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Avaa t�m�n oikotien osoittama kansio uudessa ikkunassa"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "Nime� uudelleen"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Nime� t�m� oikotie uudelleen"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "Poista"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Poista t�m� oikotie oikotiepalkista"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Virhe tallennettaessa oikoteit�."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Oikotiet"
 
@@ -26085,55 +26325,55 @@ msgstr "Oikotiet"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Ei virhett�"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Kansion hakeminen ei onnistu: %s: %s"
@@ -26178,70 +26418,70 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "M��rittelem�t�n"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Tar_kista tuetut tavat"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "I/O-virhe"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "_Poistu"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Luonnoskansio:"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "Ei viestej� valittuna"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26266,6 +26506,26 @@ msgstr "Is�nt�palvelin"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalenteri"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Ko_ntaktit:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Matkapuhelin"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Teht�v�t"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Kansion nimi:"
@@ -26278,6 +26538,34 @@ msgstr "Kansion tyyppi:"
 msgid "Specify where to create the folder:"
 msgstr ""
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Luo _uusi kansio"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Kansion nimi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Palvelimen _nimi: "
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "K�ytt�j�t_unnus:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26372,16 +26660,16 @@ msgstr "�l� kysy t�t� en�� uudelleen"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolutionin aseukseni"
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26401,7 +26689,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26410,46 +26698,46 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "�l� kysy t�t� en�� uudelleen"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolutionin s�hk�postikomponentin alustus ep�onnistui."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aloita uudelta sivulta"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttij�rjestelm�n alustus ep�onnistui"
 
@@ -26490,118 +26778,112 @@ msgstr "Kopioi valinta"
 msgid "Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Luo uusi kontakti"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Luo uusi kontaktiluettelo"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Poista valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Siirr� valitut viestit toiseen kansioon"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Liit� leikep�yt�"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Esikatselee tulostettavia kontakteja"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Tulostuksen esikatselu"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tulosta valitut kontaktit"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Valitse kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "L�het� viesti kontaktille"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Pys�yt�"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Pys�yt� lataaminen"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktiluettelo"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Kontaktit..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Siirr� kansioon..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Valitse k_aikki"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "L�het� _viesti kontaktille..."
@@ -26651,11 +26933,6 @@ msgstr "_Kuukausi"
 msgid "Previews the calendar to be printed"
 msgstr "Esikatselee tulostettavaa kalenteria"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Tulostuksen esikatselu"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -26693,7 +26970,7 @@ msgstr "_Viikko"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Sulje"
 
@@ -26707,7 +26984,7 @@ msgid "Delete this item"
 msgstr "Poista t�m� kohta"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -26719,8 +26996,8 @@ msgstr "Esikatsele tulostettavaa kohtaa"
 msgid "Print this item"
 msgstr "Tulosta t�m� kohta"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Tallenna"
 
@@ -26746,9 +27023,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -26758,7 +27035,7 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Tallenna _nimell�..."
 
@@ -26773,8 +27050,8 @@ msgstr "L�het� _viesti kontaktille..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Tallenna"
 
@@ -26871,26 +27148,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Kirjoita uusi viesti"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Kopioi valitut viestit uuteen kansioon"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "S_uodattimet..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Esikatseluruutu:"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr ""
 
@@ -26988,7 +27275,7 @@ msgstr "S�ikeistetty viesti-ikkuna"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Kansio"
 
@@ -27249,183 +27536,198 @@ msgstr "Edellinen lukematon viesti"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Vastaa"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Etsi uusia viestej� kaikista kansioista"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Edellinen t�rke� viesti"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Esikatsele tulostettavaa viesti�"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Tulosta t�m� viesti"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "_Etsi viesti�"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Tallenna viesti tiedostona"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "N�yt� t�ydet _otsikkotiedot"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "N�yt� viesti normaalimuodossa"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Peruuta valittujen viestien poistaminen"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Liit�"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Luo viestist� suodatin"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_V�litet� viesti"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Siirry"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Ty�skentele linjoilla"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "_Suuret kuvakkeet"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Siirr� kansioon"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Nime� uudelleen..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "T_y�kalut"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Sulje t�m� ikkuna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Sulje"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_N�yt�"
 
@@ -27454,170 +27756,162 @@ msgstr ""
 msgid "For_mat"
 msgstr "Tavallinen"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Liit� tiedosto viestiin tekstin�"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Liit� tekstitiedosto..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Avaa"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP-salaus"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP-allekirjoitus"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME-salaus"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME-allekirjoitus"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Tallenna nimell�"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Tallenna _luonnos"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimell�"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "L�het�"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "L�het� _my�hemmin"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "L�het� _my�hemmin"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "L�het� viesti HTML-muodossa"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "L�het� viesti my�hemmin"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "L�het� viesti heti"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "N�yt� / piilota liitetiedostot"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "N�yt� _liitteet"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "N�yt� liitteet"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Allekirjoita viesti PGP-avaimellasi"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "M��ritt�� n�ytet��nk� Kopio-kentt� (CC)."
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "M��ritt�� n�ytet��nk� L�hett�j�-kentt�"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "M��ritt�� n�ytet��nk� Vastausosoite-kentt�"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Kopio-kentt�"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Poista kaikki"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Li_s��"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Vastausosoite-kentt�"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Tallenna luettelo ja sulje ikkuna"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Ohje"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Tallenna allekirjoitus"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -27717,175 +28011,205 @@ msgid "Add to _Shortcut Bar"
 msgstr "Lis�� _oikotiepalkkiin"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Muuta t�m�n kansion nime�"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopioi t�m� kansio"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Luo _uusi kansio"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Luo oikotie t�h�n kansioon oikotiepalkkiin"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Luo uusi kansio"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr ""
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Luo uusi kansio"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Poista t�m� kansio"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "N�yt� toinen kansio"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Siirr� t�m� kansio toiseen paikkaan"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Luo _uusi kansio"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Avaa valittu kansio uudessa ikkunassa"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_S�hk�postiasetukset..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "L�het� jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Palvelimen asetukset"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "L�het� virheraportti"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "L�het� _virheraportti"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "L�het� virheraportti k�ytt�en Bug Buddy:a"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "M��rit�"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "M��rit�, n�ytet��nk� kansiopalkki"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "M��rit�, n�ytet��nk� oikotiepalkki"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "M��rit�, ty�skennell��nk� poissa linjoilta."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Tietoja Evolutionista..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Kansiopalkki"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Kansio"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Siirr�..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Uusi kansio"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "_S�hk�postiasetukset..."
+msgid "_Preferences..."
+msgstr "_Ominaisuudet..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Nime� uudelleen..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_L�het� / Vastaanota"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Oikotie"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Oikotiepalkki"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Oikotie"
+
 #: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
@@ -27901,16 +28225,39 @@ msgid "Reload the view"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Osoitekortit"
+#, fuzzy
+msgid "By _Company"
+msgstr "Yrityksen mukaan"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Yrityksen mukaan"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Osoitekortit"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
+#, fuzzy
+msgid "_Phone List"
+msgstr "_Kontaktiluettelo"
+
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Viikko"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "_N�yt�"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Kuukausi"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Ty�viikk_o"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
@@ -27937,13 +28284,19 @@ msgstr "Aiheen mukaan"
 msgid "Messages"
 msgstr "Viestit"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Ryhm�n mukaan"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Teht�v�"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28099,11 +28452,11 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Tallenna haku"
 
@@ -28143,22 +28496,22 @@ msgstr "Viesti"
 msgid "Don't show this message again."
 msgstr "�l� n�yt� t�t� viesti� uudelleen."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Etsi nyt"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "Kalenteri"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Etsi nyt"
 
@@ -28172,19 +28525,81 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS:n alustus ep�onnistui"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME:n alustus ep�onnistui"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Siirr�..."
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "P_oista t�m� tapaaminen"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O-virhe"
+
+#~ msgid "Insert File"
+#~ msgstr "Liit� tiedosto"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Olet valinnut ep�kelvon p�iv�n."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolutionin keskusteluryhm�muokkain"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Haluatko varmasti poistaa t�m�n keskusteluryhm�tilin?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Sinun tulee luoda tili ennen kuin voit l�hett�� t�t� viesti�."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP-palvelin"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "NNTP-palvelin"
+
+#~ msgid "Source"
+#~ msgstr "L�hde"
+
+#~ msgid "Source Information"
+#~ msgstr "L�hteen tiedot"
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Tallenna viesti nimell�..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Liit� tiedosto viestiin tekstin�"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Liit� tekstitiedosto..."
+
+#~ msgid "Send _Later"
+#~ msgstr "L�het� _my�hemmin"
+
+#~ msgid "Send _later"
+#~ msgstr "L�het� _my�hemmin"
+
+#~ msgid "Send the message later"
+#~ msgstr "L�het� viesti my�hemmin"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_S�hk�postiasetukset..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Osoitekirjal�hteet"
 
@@ -28273,10 +28688,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgstr "Peruuta operaatio"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Allekirjoitustiedosto:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Poista kaikki paitsi allekirjoitus"
 
@@ -28530,12 +28941,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Mobile"
 #~ msgstr "_Matkapuhelin"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Luo uusi tapaaminen"
-
-#~ msgid "Create a new task"
-#~ msgstr "Luo uusi teht�v�"
-
 #, fuzzy
 #~ msgid "New _Task"
 #~ msgstr "Uusi teht�v�"
@@ -28580,10 +28985,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgstr "Viesti l�hetetty"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Yhdist�minen palvelimeen ep�onnistui: %s"
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "Seuraava viesti"
 
@@ -28603,9 +29004,6 @@ msgstr "init_bonobo(): Bonobon alustus ep�onnistui"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisaatio:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Muista t�m� salasana"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "L�het� s�hk�postit oletuksena _HTML-muodossa."
 
diff --git a/po/fr.po b/po/fr.po
index ed33cbffe1..b0b102bd87 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0.99\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-05-14 02:20+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -37,7 +37,7 @@ msgstr "Importation fichiers VCard dans Evolution"
 msgid "File As"
 msgstr "Classer comme"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nom"
@@ -345,45 +345,45 @@ msgstr "VCard pour %s"
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Recherche..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Chargement"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Erreur dans l'expression de recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Ajout de la carte sur le serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Suppression de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modification de la carte du serveur LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Redémarrage de la recherche."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Récupération des résultats de recherche LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Erreur lors de la recherche"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Ne peut analyser la chaîne de recherche"
 
@@ -479,11 +479,11 @@ msgstr ""
 "d'annuaire avec le protocole LDAP"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -499,22 +499,31 @@ msgstr "Serveur LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Serveur LDAP contenant les inforamtions des contacts"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nouveau contact"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Contacts"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Créer un nouveau contact"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nouvelle liste de contacts"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "_Liste de Contacts"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nouveau contact"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Contacts"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Créer une nouvelle liste de contacts"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -538,30 +547,30 @@ msgstr "Ne peut analyser la chaîne de recherche"
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL n'est pas supporté dans cette compilation d'évolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Ne peut initialiser gnome-vfs"
 
@@ -569,11 +578,11 @@ msgstr "Ne peut initialiser gnome-vfs"
 msgid "Other Contacts"
 msgstr "Autres contacts"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -582,7 +591,7 @@ msgstr ""
 "Nous n'avons pu ouvrir ce carnet d'adresses.\n"
 "Vous avez saisi un URI incorrect ou le serveur LDAP est stoppé"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -594,7 +603,7 @@ msgstr ""
 "devez compiler le programme à partir des sources CVS\n"
 "après voir récupéré OpenLDAP à l'adresse indiquée ci-dessous.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,42 +611,42 @@ msgstr ""
 "Nous n'avons pas pu ouvrir ce carnet d'adresse. Veuillez vérifiez\n"
 "que le chemin existe et que vous avez la permission d'accès."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Nom commence par"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "Adresse est"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "N'importe quel champ contient"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avancée..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Toute catégorie"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le navigateur de dossier affichera"
 
@@ -757,7 +766,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Sources du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Toujours"
@@ -854,8 +863,8 @@ msgstr "Configuration"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Jamais"
 
@@ -908,8 +917,8 @@ msgstr "_Domaine de recherche :"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Recherche"
 
@@ -1107,15 +1116,15 @@ msgid "Using email address"
 msgstr "Adresse électronique"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Ajouter"
 
@@ -1162,12 +1171,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Éditer"
@@ -1284,10 +1293,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1316,44 +1325,15 @@ msgstr "(%d cachés)"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Sélectionnez les contacts dans le carnet d'adresses"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "L'expéditeur contient"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution ne peut pas accéder au stockage local du carnet d'adresses.\n"
-"Ceci peut être du à un plantage du composant evolution-addressbook.\n"
-"Pour nous aider à comprendre et corriger ce problème, veuillez envoyer\n"
-"un courrier à Jon Trowbridge <trow@ximian.com> avec une déscritpion "
-"détaillée\n"
-"des circonstances sous lesquelles cette erreur est survenue. \n"
-"Merci."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution ne peut pas accéder au stockage local du carnet\n"
-"d'adresses. Cela ne devrait jamais arriver en temps normal.\n"
-"Vous devrez peut-être redémarrer Evolution pour résoudre ce\n"
-"problème."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Sélectionnez les contacts dans le carnet d'adresses"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Sélectionnez des noms"
@@ -1375,14 +1355,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr "_Parcourir..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Catégorie :"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Dossier :"
 
@@ -1487,11 +1463,12 @@ msgstr "Veut recevoir des messages _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -2727,7 +2704,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Cacher les adresses lors de l'envoi d'un E-mail à cette liste"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Effacer"
 
@@ -2790,7 +2767,7 @@ msgstr ""
 "dans ce dossier. Voulez vous quand même l'ajouter ?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
@@ -2817,21 +2794,21 @@ msgid "Error getting book view"
 msgstr "Erreur d'obtention de la vue livre"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Succès"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -2839,8 +2816,8 @@ msgstr "Erreur inconnue"
 msgid "Repository offline"
 msgstr "Repository Hors ligne"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Permission refusée"
 
@@ -2857,7 +2834,7 @@ msgid "Protocol not supported"
 msgstr "Protocole non supporté"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2880,46 +2857,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Le fichier « %s » n'existe pas"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Autre Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Ajout liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Ajout carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Modification de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Suppression de liste : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Suppression de carte : Erreur"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Afficher les cartes ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Afficher les cartes"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2930,19 +2912,19 @@ msgstr ""
 "ouvrir\n"
 "%d nouvelles fenêtres sour votre écran. Voulez-vous vraiment tout afficher ?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Déplacer la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Copier la carte vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Déplacer les cartes vers"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Copier les cartes vers"
 
@@ -3014,7 +2996,7 @@ msgstr "Carnet d'adresses"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
@@ -3052,7 +3034,7 @@ msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
@@ -3061,8 +3043,8 @@ msgid "Send Message to Contact"
 msgstr "Envoyer un _message au contact"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimer"
@@ -3080,7 +3062,7 @@ msgid "Move to folder..."
 msgstr "Déplacer vers le dossier..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
@@ -3091,20 +3073,20 @@ msgid "Copy"
 msgstr "Copier"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Supprimer"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Vue _courante"
@@ -3269,7 +3251,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Nombre de colonnes :"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Options"
 
@@ -3359,26 +3341,26 @@ msgstr "Rendez-vous sans titre"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Haute"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Basse"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indéfinie"
@@ -3499,11 +3481,11 @@ msgstr "Durée du report (minutes)"
 msgid "_Edit appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3516,13 +3498,13 @@ msgstr ""
 "un courrier. Evolution affichera une fenêtre \n"
 "d'avertissement classique à la place."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertissement"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3539,7 +3521,7 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
@@ -3567,7 +3549,7 @@ msgstr "La description contient"
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Différent"
 
@@ -3578,7 +3560,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3600,19 +3582,19 @@ msgstr "%A %d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ne peut créer la vue du calendrier. Veuillez vérifier la configuration "
 "d'ORBit et d'OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privé"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidentiel"
@@ -3637,37 +3619,37 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Occupé"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non démarrée"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En cours"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Achevée"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3678,56 +3660,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Récurrant"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Attribué"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Oui"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Vue journalière"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Vue hebdomadaire de travail"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vue hebdomadaire"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Vue mensuelle"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -3735,12 +3716,12 @@ msgstr "Calendrier"
 msgid "Folder containing appointments and events"
 msgstr "Dossier contenant des rendez-vous et des événements"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tâches"
 
@@ -3748,37 +3729,57 @@ msgstr "Tâches"
 msgid "Folder containing to-do items"
 msgstr "Dossier contenant des éléments « À Faire »"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nouveau RDV"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Rendez-vous"
+
+#: calendar/gui/component-factory.c:709
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Supprimer le rendez-vous"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "Ré_union"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Créer un nouveau raccourci"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+#, fuzzy
+msgid "Create a new task"
+msgstr "Créer un nouveau contact « %s »"
+
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "Nouveau rendez-vous quotidien"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nouveau RDV"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Rendez-vous"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Nouveau rendez-vous quotidien"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3846,7 +3847,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Avec ces arguments :"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "jours"
 
@@ -3854,11 +3856,13 @@ msgstr "jours"
 msgid "extra times every"
 msgstr "toutes les"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutes"
 
@@ -3986,7 +3990,7 @@ msgstr "Rappels"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -4015,7 +4019,7 @@ msgstr "Fin du rendez-vous"
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4192,7 +4196,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Général"
 
@@ -4237,19 +4241,33 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "Avant le début du  rendez-vous"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "L'état de la réunion a changé. Envoyer une version corrigée ?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette réunion ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette tâche ?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Êtes-vous sûr de vouloir annuler et supprimer l'entrée de journal ?"
 
@@ -4321,61 +4339,61 @@ msgstr " (Date d'échéance "
 msgid "Due "
 msgstr "Date d'échéance "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Impossible de mettre à jour l'objet !"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet !"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Récupération de la version courante impossible !"
 
@@ -4574,7 +4592,7 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
@@ -4586,7 +4604,7 @@ msgstr "Rôle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4667,7 +4685,7 @@ msgstr "le"
 msgid "first"
 msgstr "premier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "seconde"
 
@@ -4687,7 +4705,7 @@ msgstr "dernier"
 msgid "Other Date"
 msgstr "Autre date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "jour"
 
@@ -4787,20 +4805,26 @@ msgstr "Terminé"
 msgid "Date Completed:"
 msgstr "Date d'achèvement :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Nécessite une action"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "En cours"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Priorité :"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_État :"
 
@@ -4814,7 +4838,7 @@ msgstr "Basique"
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4883,76 +4907,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "_Affecter une tâche"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches comme terminées"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
@@ -4961,8 +4985,8 @@ msgstr "Cliquez ici pour ajouter une tâche"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Terminé"
 
@@ -4990,11 +5014,9 @@ msgstr "Priorité"
 msgid "Start Date"
 msgstr "Date de début"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Résumé"
 
@@ -5036,105 +5058,104 @@ 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.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nouveau _rendez-vous"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nouvel évènement de journée complète"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimer..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Aller à la date"
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Configurer..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "_Configurer le Pilot..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Rendre cette occurence déplaçable"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Supprimer toutes les occurences"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Les utilitaires Gnome Pilot ne semblent pas installés sur ce système."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
@@ -5175,7 +5196,7 @@ msgstr "Tâche achevée : <b>"
 msgid "Task Due: <b>"
 msgstr "Tâche escomptée : <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
@@ -5184,12 +5205,12 @@ msgstr "Information iCalendar"
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5198,324 +5219,329 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Lieu :"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "État :"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Accepté pour voir"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Mise à jour"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Accepter pour voir"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Mettre à jour le status de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> a publié les informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> demande votre présence à cette réunion."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> espère être intégré à une réunion existante."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> espère recevoir les informations de la dernière réunion."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> a répondu à une demande de réunion"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> a envoyé un message incompréhensible."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> a publié les informations de la tâche."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> demande que vous exécutiez une tâche."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> espère être intégré à une tâche existante."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> espère recevoir les informationss de la dernière tâche"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une assignation de tâche."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Répondre à la tâche"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> a publié une information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> demande votre information Libre/Occupé"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> a répondu à une demande Libre/Occupé"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Le message ne semble pas être correctement rempli"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non-supportées."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "L'attachement ne contient pas d'information de calendrier valide"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "L'attachement ne contient pas d'information de calendrier visualisable"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Il y a eu une erreur lors du téléchargement des données pour"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Le fichier de calendrier n'a pas pu être mis à jour !\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le status du participant ne peut être mis à jour car l'entrée n'existe plus"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le status du participant n'a pas pu être mis à jour à cause d'un status "
 "invalide !\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Status du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Le status du participant n'a pas pu être mis à jour !\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Item envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "L'item n'a pas pu être envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Sélectionnez un Dossier"
@@ -5561,7 +5587,7 @@ msgstr "date de début"
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Participants demandés"
 
@@ -5574,57 +5600,52 @@ msgid "Non-Participants"
 msgstr "Non participants"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuel"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Groupe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressource"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Salle"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Président"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Participant exigé"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Nécessite une action"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Provisoire"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Délégué"
 
@@ -5714,48 +5735,45 @@ msgstr "Heure de _début de la réunion :"
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la réunion :"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ne peut charger les tâches dans « %s »"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La méthode requise pour charger « %s » n'est pas supportée"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ne peut ouvrir le dossier dans « %s »"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Date d'Achèvement"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Supprimer ce rendez-vous"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5766,11 +5784,16 @@ msgstr "Ne peut ouvrir le dossier dans « %s »"
 msgid "The method required to open `%s' is not supported"
 msgstr "La méthode requise pour ouvrir « %s » n'est pas supportée"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ouverture du calendrier à %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Ouverture du dossier %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Avril"
@@ -5827,51 +5850,56 @@ msgstr "Octobre"
 msgid "September"
 msgstr "Septembre"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Au moins un participant est nécessaire"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Un organizer doit être configuré."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Information événement"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informations du journal"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Information calendrier"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Mis à jour"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Contre-proposition"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Vous devez être inscrit comme participant à l'événement."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Ne peut initialiser Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Impossible de créer l'usine à éditeurs de composants"
 
@@ -6098,9 +6126,8 @@ msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Aperçu Avant Impression"
 
@@ -6135,8 +6162,8 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
@@ -6198,15 +6225,27 @@ msgstr "Importation fichiers iCalendar dans Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importe des fichiers vCalendar dans Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr "Rappel !!"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr "Évenements Calendrier"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6214,94 +6253,94 @@ msgstr ""
 "Evolution a trouvé des fichiers Gnome Calendar.\n"
 "Voulez-vous les importer dans Evolution ?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "Calendrier Gnome"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now attend 0 argument"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time attend 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time attend une chaîne de caractères pour l'argument 1"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time attend une chaîne de date ISO 8601 pour l'argument 1"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add attend 2 arguments"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add attend un entier pour l'argument 2"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin attend 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time_day-end attend 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype attend 0 argument"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "Occur-in-time-range ? attend 2 arguments"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 1"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "Occur-in-time-range ? attend un time_t pour l'argument 2"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains ? attend 2 arguments"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 1"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains ? attend une chaîne pour l'argument 2"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains ? attend « any », « summary », « description » pour l'argument 1"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories ? attend au moins 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6309,19 +6348,19 @@ msgstr ""
 "has-categories ? attend tous les arguments comme chaîne ou seulement 1 "
 "argument comme booléen faux (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed ? attend 0 argument"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before. attend 1 argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? attends un t_time comme premier argument"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "L'évaluation de l'expression de recherche ne produit pas un booléen"
 
@@ -7918,71 +7957,81 @@ msgstr "Ecriture du dossier « %s »"
 msgid "You must be working online to complete this operation"
 msgstr "Vous devez travailler en ligne pour terminer cette opération"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur analyse filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier de spool"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Ne peut traiter le dossier de spool"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Ne peut ouvrir le message"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie message %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d parmis %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie message %d du %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Échec de la récupération du message"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Arguments invalides"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Arguments invalides"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
@@ -8038,7 +8087,7 @@ msgstr "Déplacement des messages"
 msgid "Copying messages"
 msgstr "Copie des messages vers %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8046,47 +8095,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Annulé."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue du serveur IMAP : %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Aucun nom de fichier spécifié"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossible de crypter ce message : aucun déstinataire n'est spécifié"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8094,18 +8143,18 @@ msgid ""
 "%.*s"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Impossible de mettre le message %s en cache : %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Échec de décodage du message."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8133,24 +8182,24 @@ msgid "Could not lock '%s'"
 msgstr "Ne peut verrouiller '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ne peut créer le fichier de verrouillage pour %s : %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez de "
 "nouveau plus tard."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Impossible d'obtenir le verrou avec fcntl(2) : %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Impossible d'obtenir le verrou avec flock(2) : %s"
@@ -8209,11 +8258,16 @@ msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire de courrier : %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Impossible de décrypter : Erreur inconnue"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Impossible de décrypter : Erreur inconnue"
@@ -8353,7 +8407,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'identification du serveur."
 
@@ -8529,33 +8583,134 @@ msgstr "Impossible d'obtenir le dossier : Opération invalide sur ce stockage"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de créer le dossier : Opération invalide sur ce stockage"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Échec de vérification des certificats."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Émetteur : %s\n"
-"Sujet : %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Échec de vérification des certificats."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Sélectionnez un fichier de signature"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID de Certificat : "
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Erreur de chargement %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Hors du bureau"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Échec de vérification des certificats."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID de Certificat : "
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argument invalide"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID de Certificat : "
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID de Certificat : "
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
 msgstr ""
-"Mauvais certificat de %s :\n"
-"\n"
-"%s\n"
-"\n"
-"Désirez-vous accepter quand même ?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8568,16 +8723,33 @@ msgstr ""
 "Empreinte  :        %s\n"
 "Signature  :        %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "MAUVAIS"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Mauvais certificat de %s :\n"
+"\n"
+"%s\n"
+"\n"
+"Désirez-vous accepter quand même ?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8597,32 +8769,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne peut analyser l'URL « %s »"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Erreur au lancement de %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Pas de tel message %s dans %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : Dossier inéxistant"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : Opération invalide"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
@@ -8630,12 +8807,12 @@ msgstr "Impossible de renommer le dossier : %s : Dossier inexistant"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
@@ -8664,40 +8841,40 @@ msgstr "La réponse du serveur IMAP ne contient pas l'information %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Réponse OK inattendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut créer le répertoire %s : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne peut charger le résumé pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a été détruit et recréé sur le serveur"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 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:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Examen des nouveaux messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 
@@ -8706,10 +8883,10 @@ msgstr "Ne peut trouver le corps du message dans la réponse FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Ne peut ouvrir le répertoire de cache : %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Impossible de mettre le message %s en cache : %s"
@@ -8722,7 +8899,7 @@ msgstr "Vérification si nouveau courrier"
 msgid "Check for new messages in all folders"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Dossiers"
 
@@ -8752,7 +8929,7 @@ msgstr "Lecture et stockage du courrier sur des serveurs IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -8762,70 +8939,74 @@ msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Connexion annulée"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter à %s (port %d) : %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr " Échec des négociations SSL"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Le dossier n'est pas vide"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Pas de support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8836,31 +9017,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Pas de tel dossier « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Le nom de dossier ne peut contenir le caractère RC"
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ne peut ouvrir la boîte à lettres : %s : %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8882,7 +9069,10 @@ msgid "Local delivery"
 msgstr "Distribution locale"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 "Pour récupérer le courrier local dans des boîtes aux lettres au format "
 "standard mbox"
@@ -8915,12 +9105,12 @@ msgstr "Boîte aux lettres format mbox (standard Unix)"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Pour stocker le courrier local dans des fichiers au format mbox"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8931,38 +9121,38 @@ msgstr "La racine de stockage %s n'est pas un chemin absolu"
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un répertoire habituel"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne peut obtenir le répertoire : %s : %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas de boîte de réception"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossible de supprimer le fichier d'index de dossier « %s » : %s"
@@ -9022,7 +9212,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9060,24 +9250,24 @@ msgstr "n'est pas un répertoire maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossible de scruter le dossier « %s » : %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Impossible d'ouvrir le répetoire maildir : %s : %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Vérification du dossier"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Recherche de nouveaux messages"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ecriture du dossier"
@@ -9121,7 +9311,7 @@ msgstr "Le dossier semble irrémédiablement corrompu"
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Erreur construction message : Boîte à lettre corrompue ?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9130,7 +9320,7 @@ msgstr ""
 "Impossible d'ouvrir le fichier « %s » :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9139,14 +9329,14 @@ msgstr ""
 "Ne peut créer le fichier « %s » :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "« %s » n'est pas un fichier normal."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9155,7 +9345,7 @@ msgstr ""
 "Ne peut supprimer le dossier « %s » :\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier « %s » n'est pas vide. Non supprimé."
@@ -9172,65 +9362,65 @@ msgstr ""
 "Erreur fatale d'analyse du courrier prés de la position %ld dans le dossier %"
 "s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossible de vérifier le dossier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossible d'ouvrir le fichier : %s : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la boîte à lettres temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Échec d'écriture dans la boite à lettres temporaire : %s : %s"
@@ -9382,47 +9572,47 @@ msgstr "Utilisez annuler"
 msgid "Operation failed: %s"
 msgstr "Opération échouée : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Récupération résumé POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Opération annulée"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Impossible d'optenir le résumé POP : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Nettoyer les messages supprimés"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Récupération du message POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Impossible d'obtenir le message : %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -9439,7 +9629,7 @@ msgstr "Ne pas effacer les messages du serveur"
 msgid "Delete after %s day(s)"
 msgstr "Supprime apès %s jour(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9465,6 +9655,11 @@ msgstr ""
 "chiffré via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs même si le serveur prétend pouvoir le supporter."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Ne peut se connecter à %s (port %d) : %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9473,55 +9668,60 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur POP %s en mode sécurisé : %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
-#, c-format
-msgid "Could not connect to POP server on %s"
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "Ne peut se connecter au serveur POP sur %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mécanisme d'identification demandé."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL '%s' Identification échouée : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "Erreur de protocole SASL"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "Erreur d'E/S : %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"Impossible de vous identifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier « %s »."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9547,35 +9747,35 @@ msgstr "Ne peut créer de tube vers sendmail : %s : courrier non envoyé"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ne peut cloner sendmail : %s : courrier non envoyé"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossible d'envoyer le message : %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail s'est terminé avec le signal %s : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ne peut exécuter %s : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail s'est terrminé avec l'état %d : courrier non envoyé."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "Livraison du courrier via le programme sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9685,41 +9885,41 @@ msgstr "Anomalie authentification temporaire"
 msgid "Authentication required"
 msgstr "Identification requise"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erreur du message de bienvenue : %s : sûrement pas grave"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Erreur réponse QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Impossible de se connecter au serveur SMTP %s en mode sécurisé : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr "le serveur ne semble pas supporter SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Requête STARTTLS expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr "Erreur de réponse STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Le serveur SMTP %s ne supporte pas le type d'identification demandé %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9730,89 +9930,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Livraison du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Ne peut envoyer le message : l'adresse de l'expéditeur n'est pas valide"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne peut envoyer le message : aucun destinataire n'est défini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne peut envoyer le message : un ou plusieurs déstinataires invalides."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Demande HELO dépassée : %s non fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Erreur réponse HELO : %s non fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Demande RSET dépassée : %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Identification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Erreur création objet identification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Erreur demande AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'identification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Demande MAIL FROM dépassée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "Erreur réponse MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Demande RCPT TO expirée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Echec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -9820,86 +10020,86 @@ msgstr "Demande DATA expirée : %s : courrier non envoyé."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Erreur réponse DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Envoi DATA expiré : Arrêt du message : %s : courrier non envoyé."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "Erreur réponse de fin de DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Demande RSET dépassée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "Erreur réponse RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Réponse QUIT dépassée : %s / non fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Demande AUTH expirée : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "Erreur réponse QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "pièce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 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:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Ajouter une pièce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossible d'attacher ke fichier %s : %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -9918,56 +10118,60 @@ msgid "MIME type:"
 msgstr "Type MIME :"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "De :"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Répondre-à :"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "De :"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "À :"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Saisissez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc :"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Saisissez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc :"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9975,17 +10179,25 @@ msgstr ""
 "Saisissez les adresses qui recevront une copie carbone du message sans "
 "apparaitre dans la liste des destinataires du messages."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ne peut créer un contexte de signature PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9994,34 +10206,34 @@ msgstr ""
 "Erreur durant la lecture du fichier %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Avertissement !"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Le fichier existe, l'écraser ?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erreur accès au fichier : %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Ne peut récupérer le message de l'éditeur"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10030,7 +10242,7 @@ msgstr ""
 "Ne peut rechercher dans le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10039,7 +10251,7 @@ msgstr ""
 "Ne peut tronquer le fichier : %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10048,7 +10260,7 @@ msgstr ""
 "Erreur lors de l'auto-enregistrement du message : %s :\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10056,7 +10268,7 @@ msgstr ""
 "Evolution a trouvé des fichiers non enregistrés d'une session précédente.\n"
 "Voulez-vous essayer de les récupérer ?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10066,43 +10278,39 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Avertissement : Message modifié"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Insérer un fichier"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Signature"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "Restaurer les valeurs par défaut"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10110,7 +10318,7 @@ msgstr ""
 "Impossible de créer la fenête de composition:\n"
 "Impossible d'activer le composant de sélection d'adresse."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10118,9 +10326,10 @@ msgstr ""
 "Impossible de créer la fenêtre de composition :\n"
 "Ne peut activer le composant « Editeur HTML »."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
+#, fuzzy
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(L'éditeur contient un corps de message non textuel, qui ne peut être "
@@ -10186,8 +10395,8 @@ msgstr "Le sujet contient"
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10195,12 +10404,11 @@ msgstr ""
 "Un fichier ayant le même nom existe.\n"
 "L'écraser ?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Se souvenir du mot de passe"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
 
@@ -10298,149 +10506,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "an"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "années"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "secondes"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mois"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minute"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mois"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "heure"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "semaine"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "heure"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mois"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minute"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mois"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "secondes"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "an"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "années"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Vous avez oublié de choisir une date."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Vous avez choisi une date invalide."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La date du message sera comparée quelle que soit l'heure où\n"
-"le filtre est lancé ou le dossier virtuel ouvert."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La date du message sera comparée à la date\n"
-"que vous spécifiez ici."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La date du message sera comparée à une date\n"
-"relative au moment où le filtre est exécuté;\n"
-"« il y a une semaine », par exemple."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "la date actuelle"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "une date que vous spécifiez"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "une date relative à la date en cours"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Sélectionnez une heure pour la comparaison"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Comparer avec"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<cliquez ici pour sélectionner une date>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "maintenant"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr "passé(e)s"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr "passé(e)s"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %H:%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<cliquez ici pour sélectionner une date>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Sélectionnez une heure pour la comparaison"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Règles de Filtrage"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Spécifiez le nom de fichier : "
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool « %s » n'existe pas ou n'est pas un fichier normal."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Ouvrir un fichier"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Alors"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Ajouter l'action"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10449,12 +10608,12 @@ msgstr ""
 "Revenez en arrière et spécifiez un dossier valide pour\n"
 "y délivrer du courrier."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10463,92 +10622,164 @@ msgstr ""
 "Erreur dans l'expression régulière « %s » :\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Important"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr "Travail"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr "Personnel"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
+msgstr "À faire"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr "Plus tard"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Vous devez changer le nom de ce dossier virtuel."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nom de la règle : "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Exécuter les actions"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "si tous les critères sont remplis"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "si un des critères est rempli"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Ajouter un critère"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "entrant"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "sortant"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Comparer avec"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Éditer les Filtres"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Éditer les dossiers virtuels"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrant"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La date du message sera comparée à la date\n"
+"que vous spécifiez ici."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La date du message sera comparée à une date\n"
+"relative au moment où le filtre est exécuté;\n"
+"« il y a une semaine », par exemple."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La date du message sera comparée à la date\n"
+"que vous spécifiez ici."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "une date relative à la date en cours"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "passé(e)s"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "Dossiers spécifiques seulement"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "la date actuelle"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "une date que vous spécifiez"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Sources de Dossier Virtuel"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "Avec tous les dossiers actifs distants"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "Avec tous les dossiers actifs locaux et distants"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "Avec tous les dossiers locaux"
 
@@ -10574,41 +10805,42 @@ msgid "Beep"
 msgstr "Bip"
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
-msgstr "Commande"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contient"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copier vers le dossier"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date de réception"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date d'envoi"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ne contient pas"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "ne finit pas par"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "n'existe pas"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "n'existe pas"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ne ressemble pas à"
@@ -10630,87 +10862,83 @@ msgid "ends with"
 msgstr "finit par"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Exécuter la commande "
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expression"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Donner suite"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Important"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "est"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "est aprés"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "est avant"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "est Marqué"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "est plus grand que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "est inférieur à"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "n'est pas"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "n'est pas Marqué"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr "Étiquette"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Liste de diffusion"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corps du message"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "En-tête du message"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Déplacer vers le dossier"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Exécuter la commande "
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Jouer un son"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lu"
 
@@ -10726,57 +10954,87 @@ msgstr "Regex correspond"
 msgid "Replied to"
 msgstr "Répondu à"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "est plus grand que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "est inférieur à"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Définir l'état"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Exécuter la commande "
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Taille (ko)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "ressemble à"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Compte source"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "En-tête spécifique"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "Débute par"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Arrête le traitement"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Définir l'état"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Règles"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Ajouter une règle"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Éditer la règle"
 
@@ -10784,11 +11042,11 @@ msgstr "Éditer la règle"
 msgid "Score Rules"
 msgstr "Règles des scores"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Vous devez nommer ce dossier virtuel."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Vous devez spécifier au moins un dossier comme source."
 
@@ -10796,31 +11054,31 @@ msgstr "Vous devez spécifier au moins un dossier comme source."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importe vos anciens courriers Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importation..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Veuillez attendre"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importation de %s comme %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Scrutation de %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Courrier"
 
@@ -10881,39 +11139,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes données Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Corbeille"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fichier de courrier local %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scrutation du répertoire"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Début importation :"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Réglages"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Éditer les Filtres"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10991,11 +11249,11 @@ msgstr "Utilitaire pour le composant de résumé de messagerie."
 msgid "Font Preferences"
 msgstr "Préférences du courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail Accounts"
 msgstr "Comptes de courrier"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr "Préférences du courrier"
 
@@ -11047,7 +11305,7 @@ msgstr "Propriétés..."
 msgid "Change this folder's properties"
 msgstr "Modifier les propriétés de ce dossier"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11055,59 +11313,79 @@ msgstr ""
 "Certains de vos règlages de messagerie semblent corrompus, vérifiez que tout "
 "est en ordre."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas défini de méthode de transport de courrier"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Avertissement : Message modifié"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nouveau message électronique"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Message électronique"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Composer un message"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Message _suivant"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Message _précédent"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nouveau message électronique"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Ne peut initialiser le composant de configuration de messagerie d'Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Impossible d'initialiser le composant d'information des dossiers d'Evolution"
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriétés de « %s »"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propriétés"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut créer de répertoire temporaire : %s"
@@ -11156,125 +11434,125 @@ msgstr "%d au total"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'expéditeur"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les destinataires"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la liste de diffusion"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editer comme nouveau  message..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Répondre à l'expéditeur"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marquer comme _Important"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme Non Im_portant"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "Dossier virtuel sur la liste de _diffusion"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtre sur la _liste de diffusion (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dossier virtuel sur la liste de _diffusion (%s)"
@@ -11338,75 +11616,66 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editeur de News d'Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nom d'_utilisateur :"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "De pas supprimer"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Effacer réellement le compte ?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Désactiver."
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Activer"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activé"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Nom de Compte"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protocole"
 
@@ -11415,30 +11684,30 @@ msgstr "Protocole"
 msgid "Mail to %s"
 msgstr "Courrier à %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Sujet est %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Ajouter une Règle de Filtre"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11450,7 +11719,7 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11462,7 +11731,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11470,7 +11739,7 @@ msgstr ""
 "Vous devez configurer une identité\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11479,7 +11748,7 @@ msgstr ""
 "avant de pouvoir composer un message."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11487,11 +11756,11 @@ msgstr ""
 "Vous êtes sur le point d'envoyer un courrier au format HTML, mais les "
 "déstinataires suivants ne veulent pas de ce format :\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Envoyer tout de même ?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11499,7 +11768,7 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11507,11 +11776,11 @@ msgstr ""
 "Depuis que la liste de contacts que vous envoyez est configurée pour cacher "
 "la liste d'adresses, ce message contiendra seulement des destinataires Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Le message contient seulement des destinataires Bcc"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11521,16 +11790,12 @@ msgstr ""
 "en ajoutant un en-tête Apparently-To.\n"
 "Envoyer quand même ?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "Vous devez spécifier des destinataires afin de pouvoir envoyer ce message."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Vous devez configurer un compte avant de pouvoir envoyer ce message."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11538,28 +11803,28 @@ msgstr ""
 "Impossible d'ouvrir le dossier brouillons pour ce compte.\n"
 "Voulez-vous utiliser le dossier brouillons générique ?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Le %a %d/%m/%Y à %H:%M,  %%s a écrit :"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Déplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Êtes-vous sûr de vouloir éditer tous les %d messages  ?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11567,7 +11832,7 @@ msgstr ""
 "Vous ne pouvez éditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11575,32 +11840,32 @@ msgstr ""
 "Vous ne pouvez renvoyer des messages que\n"
 "lorsqu'ils sont dans le dossier Envoyés."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Êtes-vous sûr de vouloir renvoyer tous les %d messages ?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Aucun message sélectionné"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Écraser le fichier ?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Enregistrer le message sous..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Enregistrer les messages sous..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Aller au dossier suivant conntenant des messages non lus ?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11608,7 +11873,7 @@ msgstr ""
 "Il n'y a plus de nouveau messages dans ce dossier.\n"
 "Voulez-vous aller au dossier suivant ?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11620,7 +11885,7 @@ msgstr ""
 "\n"
 "Effacer réellement ces messages ?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11629,28 +11894,28 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d parmis %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Échec de l'impression du message"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11676,7 +11941,7 @@ msgstr "_Script"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Sans nom"
 
@@ -11696,10 +11961,11 @@ msgid "Add Signature"
 msgstr "Signature"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Veuillez saisir votre nom et votre adresse électronique. Les champs "
 "« optionnels » ci-dessous n'ont pas besoin\n"
@@ -11707,10 +11973,10 @@ msgstr ""
 "les messages que vous envoyez."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Veuillez saisir les informations de votre serveur de courrier entrant.\n"
 "Si vous n'êtes pas sûr, demandez à votre administrateur système ou à votre\n"
@@ -11721,24 +11987,23 @@ msgid "Please select among the following options"
 msgstr "Veuillez sélectionnez parmi les options suivantes"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Veuillez saisir les informations nécessaires pour envoyer votre courrier.\n"
 "Si vous n'êtes pas sûr, demandez à votre administrateur système ou à votre\n"
 "fournisseur d'accès Internet."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "La configuration de la messagerie est presque faite. L'identité, du serveur "
 "d'entrée \n"
@@ -11749,40 +12014,20 @@ msgstr ""
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Assistant de compte d'Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-msgid "Work"
-msgstr "Travail"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr "Personnel"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr "À faire"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr "Plus tard"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Compte"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Service de vérification"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Connexion au serveur"
 
@@ -12034,224 +12279,213 @@ msgstr "Étiquettes et couleurs"
 msgid "Loading Images"
 msgstr "Chargement des images"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuration de la messagerie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localisation de la boîte à lettres"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Éditeur de messages"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Affichage du message"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Serveur NNTP :"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notification du courrier entrant"
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr "Serveurs de nouvelles"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informations optionnelles"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Organisation :"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _clé PGP : "
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Avertissement lors de l'envoi d'un message avec uniquement des destinataires "
 "_Bcc"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimer les contacts sélectionnés"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Répertoire de courrier Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 msgid "Quote original message"
 msgstr "Citer le message d'origine"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Cité"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Répondre-à :"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Options de réception"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Se souvenir du mot de passe"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Informations requises"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Restaurer les valeurs par défaut"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sécurité"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sécurisé (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr "Sélectionner un programme PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Dossier des _messages envoyés : "
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messages envoyés et brouillons"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Le serveur nécessite une identification"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuration du serveur"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Type de serveur : "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Types de raccourcis : "
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Signature"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Signature"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Source"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informations de source"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Spécifiez le nom de fichier : "
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Correction orthographique"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Correction orthographique"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "mbox Unix standard"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12259,12 +12493,12 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par example : « Travail » ou « Personnel »"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12274,205 +12508,201 @@ msgstr ""
 "\n"
 "Cliquez sur  « Suivant » pour commencer."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Toujours charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Type d'authentification : "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "Type d'_authentification : "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Vérifier automatiquement la présence de nouveaux messages"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Émettre un bip lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID de Certificat : "
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr "_Confirmer avant le nettoyage du dossier"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_Signature texte :"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Défauts"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ne pas prévenir lors de l'arrivée de courrier"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Activer"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Style de transfert par défaut : "
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Nom complet :"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Courrier HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identité"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 "_Charger les images si l'expéditeur est présent dans le carnet d'adresses"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "En faire mon compte par défaut"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marquer les messages comme lus après"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Ne jamais charger les images hors du réseau"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Chemin binaire _PGP"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Jouer un fichier son lorsque du courrier arrive"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Avertissement lors de l'envoi d'un message HTML à des contacts qui n'en "
 "veulent pas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avertissement lors de l'envoi d'un message sans sujet"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Réception des messages"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Style de réponse par défaut : "
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Restore defaults"
 msgstr "Restaurer les valeurs par défaut"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr "_Script : "
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sécurité"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Envoi du message"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Afficher les images animées"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Signatures"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Utilisez une connexion _sécurisée (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_toutes les"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "couleur"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "description"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12496,200 +12726,211 @@ msgstr "Ne peut créer un contexte d'enveloppe S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Ne peut créer un contexte de décodage S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Ne peut créer le fichier temporaire : « %s » : %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Enregistrer sur le disque..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Enregistrer la pièce-jointe"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Chargement des images"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Chargement contenu de message"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tâches en _retard :"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %H:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Ouvrir un lien dans le Navigateur"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copier l'emplacement du lien"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Enregistrer le lien sous (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "pièce-jointe %s"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Impossible d'analyser le message MIME. Afficher comme source"
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Date"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Mauvaise adresse"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Répondre-À :"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "À"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "Logiciel de messagerie"
 
-#: mail/mail-format.c:1736
-msgid "View messages..."
-msgstr "Voir les messages..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Ce message est signé numériquement. Cliquez sur l'icône de verrou pour plus "
 "d'information."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Ne peut créer un contexte de vérification PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Ce message est signé numériquement et a été certifié authentique."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Ce message est signé numériquement mais ne peut être certifié authentique."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointeur sur le site FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointeur sur le fichier local (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointeur sur des données distantes (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointeur sur des données externes inconnues (« %s » type)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Partie corps externe malformée"
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Dossiers locaux"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Reconfiguration du dossier"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Ne peut enregistrer les méta-informations du dossier; vous \n"
 "n'allez probablement plus pouvoir ouvrir ce dossier : %s : %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossible d'enregistrer les méta-informations du dossier dans %s : %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossible de supprimer les méta-informations du dossier %s : %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier « %s » vers le format « %s »"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s ne peut être reconfigurer cr il ne s'agit pas d'un dossier local."
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12697,16 +12938,16 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boîte aux lettres, \n"
 "vous aurez besoin de la réparer manuellement."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vous ne pouvez modifier le format d'un dossier non local"
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigure /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12715,7 +12956,7 @@ msgstr ""
 "Erreur durant « %s » :\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12724,7 +12965,7 @@ msgstr ""
 "Erreur durant l'exécution de l'opération :\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Travail en cours"
 
@@ -12732,100 +12973,100 @@ msgstr "Travail en cours"
 msgid "Filtering Folder"
 msgstr "Filtrage du dossier"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Rapatriement du courrier"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ">Toutefois, le message a été correctement envoyé."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Expédition de « %s »"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d du %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Echec sur le message %d parmis %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Terminé"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans « %s »"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Messages suivis"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Effacement du dossier %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ecriture du dossier « %s »"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Rafraichissement du dossier"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Récupération de %d message(s)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Enregistrement de %d message(s)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12834,7 +13075,7 @@ msgstr ""
 "Ne peut créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12843,11 +13084,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce-jointe"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12856,27 +13097,22 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut écrire les données : %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Exécution de la commande : %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "Rechercher"
 
@@ -12931,32 +13167,41 @@ msgstr "Chemin : %s, Type : %s"
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Envoyer & Recevoir le courrier"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Annuler tout"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Mise à jour..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé la requête"
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Se _souvenir du mot de passe"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Se souvenir de ce mot de passe pour le reste de cette session"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
@@ -12986,7 +13231,7 @@ msgstr ""
 "Saisissez le nom par lequel vous voulez désigner ce compte.\n"
 "Par example : « Travail » ou « Personnel »"
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nom :"
 
@@ -13016,7 +13261,7 @@ msgstr "Message suivi - %s"
 msgid "Forwarded message"
 msgstr "Message suivi"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Message suivi"
 
@@ -13030,7 +13275,7 @@ msgstr "Mise en place du dossier virtuel : %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Mise à jours des dossiers virutels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13043,94 +13288,97 @@ msgstr ""
 "        « %s »\n"
 "Et ont été mis à jour."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Pas de sujet)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Message"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Messages non vus multiples"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %H:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Generation de la liste des messages"
 
@@ -13163,43 +13411,43 @@ msgstr "Reçu"
 msgid "Size"
 msgstr "Taille"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Appel"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Pas de réponse nécessaire"
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Répondre"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Répondre à tous"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
@@ -13223,16 +13471,16 @@ msgstr "Abonnement au dossier « %s »"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Désabonnement du dossier « %s »"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dossier"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
@@ -17691,11 +17939,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23111,8 +23361,8 @@ msgstr "Pas de description"
 msgid "Mail summary"
 msgstr "Résumé de courrier"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
@@ -23130,15 +23380,15 @@ msgstr "KPRX"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionnary.com du jour"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Citations du jour"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Ajouter un serveur de news"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Saisissez l'URL du serveur de news que vous voulez ajouter"
 
@@ -23150,26 +23400,26 @@ msgstr "Erreur lors du téléchargement des données RDF"
 msgid "News Feed"
 msgstr "Serveur de forums"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Ajouter"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Montré"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Aucune tâche"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Aucune description)"
 
@@ -24441,7 +24691,8 @@ msgid "Tasks "
 msgstr "Tâches"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Paramétrage de la météo"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24499,7 +24750,7 @@ msgstr "Afficher les détails"
 msgid "Cancel Operation"
 msgstr "Annuler l'opération"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24513,20 +24764,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Boîte d'expédition"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Envoyé"
 
@@ -24765,22 +25016,15 @@ msgstr ""
 "« %s »"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Créez un nouveau dossier"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Le type du dossier sélectionné n'est pas valide pour\n"
-"l'opération demandée."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "_Créer un nouveau dossier..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nouveau..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sans titre)"
 
@@ -24802,7 +25046,7 @@ msgstr ""
 "Vous pouvez sélectionner « Automatique » si vous l'ignorez, et Evolution "
 "essaiera de l'utiliser."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Veuillez sélectionner les informations que vous désirez importer :"
 
@@ -24833,21 +25077,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier « %s » n'existe pas"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Erreur Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Vous ne pouvez importer que vers des dossiers locaux"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24856,11 +25096,11 @@ msgstr ""
 "Il n'y a pas d'outils d'import capable de traiter\n"
 "%s."
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importation"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24869,17 +25109,17 @@ msgstr ""
 "Importation %s.\n"
 "Lancement %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Erreur au lancement de %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Erreur de chargement %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24888,31 +25128,31 @@ msgstr ""
 "Importation %s\n"
 "Importation élément 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Type de fichier :"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importer les données et règlages d'autres programmes"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importer un seul fichier"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24920,24 +25160,24 @@ msgstr ""
 "Veuillez attendre...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Importateurs intelligents de démarrage"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Sélectionnez un Dossier"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Sélectionnez un dossier de destination pour importer ces données"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importer"
 
@@ -24985,9 +25225,14 @@ msgstr "Ouverture du dossier %s"
 msgid "in \"%s\" ..."
 msgstr "Ouvrir dans %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Impossible de renommer le dossier : %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Ne peut créer le dossier spécifié :\n"
 "« %s »"
@@ -25006,8 +25251,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Impossible de lancer l'interface de l'assistant du lecteur de courriers\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nouveau"
@@ -25048,58 +25293,59 @@ msgstr "Aller au dossier..."
 msgid "Select the folder that you want to open"
 msgstr "Sélectionnez le dossier que vous voulez ouvrir"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Créer un nouveau raccourci"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Sélectionnez le dossier que le raccourci doit pôinter :"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Travail _En ligne"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Travail _Hors ligne"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affiché)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Aucun)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est en ligne. Cliquez sur ce bouton pour travailler hors "
 "ligne."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evloution va travailler hors ligne."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25110,12 +25356,12 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne peut paramétrer le stockage local -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25126,31 +25372,31 @@ msgstr ""
 "terminé de manière inattendue. Vous devrez relancer Evolution pour voir\n"
 "ces données à nouveau."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Arguments invalides"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Impossible enregistrer dans OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Erreur générique"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Créer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25159,107 +25405,117 @@ msgstr ""
 "Voulez-vous vraiment enlever le groupe\n"
 "« %s » de la barre de raccourcis ?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Ne pas enlever"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Renommer le groupe de raccourcis sélectionné par :"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Petites icônes"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Afficher les raccourcis sous forme de petites icônes"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Grandes icônes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Afficher les raccourcis sous forme de grandes icônes"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nouveau groupe..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Créer un nouveau groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Supprimer ce groupe..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Supprimer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Re_nommer ce groupe..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Renommer ce groupe de raccourcis"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Masquer la barre de _raccourcis"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Masquer la barre de raccourcis"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Créer un nouveau raccourci"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Créer un nouveau raccourci"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Renommer le raccourci"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Renommer le raccourci sélectionné par :"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Ouvrir le dossier lié à ce raccourci"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "_Ouvrir dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Ouvrir le dossier lié à ce raccourci dans une nouvelle fenêtre"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Renommer ce raccourci"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Supprimer"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Supprimer ce raccourci de la barre de raccourcis"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erreur lors de l'enregistrement des raccourcis."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
@@ -25267,55 +25523,55 @@ msgstr "Raccourcis"
 msgid "Checkbox"
 msgstr "Case à cocher"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le même nom existe déjà"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spécifié n'est pas valide"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisamment d'espace pour créer le dossier"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Le dossier n'est pas vide"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Le dossier spécifié n'a pas été trouvé"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implémenté dans ce stockage"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Opération non supportée"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Le type spécifié n'est pas supporté dans cette stockage"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Le dossier spécifié ne peut pas être modifié ou effacé"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Ne peut faire un dossier un enfant de ses descendants"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Impossible de créer un dossier avec ce nom"
 
@@ -25369,63 +25625,63 @@ msgstr ""
 "L'erreur du système d'activation est :\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Erreur CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Interrompu"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Argument invalide"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "A déjà un propriétaire"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Pas de propriétaire"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Non trouvée"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Tyoe non-supporté"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Schéma non supporté"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Opération non-supportée"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI invalide"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "A des sous-dossiers"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Pas de place restante"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "L'ancien propriétaire s'est terminé"
 
@@ -25450,6 +25706,26 @@ msgstr "Hôte :"
 msgid "The following connections are currently active:"
 msgstr "Les connexions suivantes sont actives :"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Calendrier"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacts : "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Courrier"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tâches"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nom du dossier : "
@@ -25462,6 +25738,34 @@ msgstr "Type de dossier :"
 msgid "Specify where to create the folder:"
 msgstr "Précisez où créer le dossier."
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "_Créer un nouveau dossier..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nom du dossier : "
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Nom du _serveur :"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nom d'_utilisateur :"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de réglages d'Evolution"
@@ -25558,15 +25862,15 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ne peut importer de données depuis les fichiers suivants :"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution se ferme..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25586,44 +25890,44 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne plus me demander"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne peut accéder au shell de Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne peut initialiser le shell de Ximian Evolution : %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Désactiver la fenêtre de démarrage"
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25632,7 +25936,7 @@ msgstr ""
 "%s : --online et --offline ne peuvent pas être utilisés \n"
 "ensemble. Utilisez %s --help pour plus d'informations.\n"
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
@@ -25667,113 +25971,107 @@ msgstr "Copier la sélection"
 msgid "Copy to Folder..."
 msgstr "Copier vers le dossier..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Créer un nouveau contact"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Créer une nouvelle liste de contacts"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Couper la sélection"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Supprimer les contacts sélectionnés"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Déplacer le(s) contact(s) vers un autre dossier..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Déplacer vers le dossier..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Coller le contenu du presse-papiers"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Prévisualiser les contacts à imprimer"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "_Aperçu Avant Impression"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimer les contacts sélectionnés"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Enregistrer les contacts sélectionnés comme une Vcard"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Sélectionner tout"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Sélectionner tous les contacts"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Envoyer un message aux contacts sélectionnés."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Envoyer un message au contact"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Envoyer les contacts sélectionnés à quelqu'un d'autre."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Arrêter le chargement"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Voir le contact courant"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Liste de Contacts"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Faire suivre au contact..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Déplacer vers le dossier..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Enregistrer comme VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Sélectionner tout"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Envoyer un _message au contact..."
 
@@ -25817,11 +26115,6 @@ msgstr "Mois"
 msgid "Previews the calendar to be printed"
 msgstr "prévisualise le message a imprimer"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "_Aperçu Avant Impression"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimer ce calendrier"
@@ -25854,7 +26147,7 @@ msgstr "Semaine"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Fermer"
 
@@ -25867,7 +26160,7 @@ msgid "Delete this item"
 msgstr "Supprimer cet élément"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
@@ -25879,8 +26172,8 @@ msgstr "Prévisualiser l'élément à  imprimer"
 msgid "Print this item"
 msgstr "Imprimer cet élément"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -25905,9 +26198,9 @@ msgstr "Enregistrer cet élément sur le disque"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fichier"
 
@@ -25917,7 +26210,7 @@ msgstr "Imprimer une en_veloppe..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Enregistrer _sous..."
 
@@ -25931,8 +26224,8 @@ msgstr "Envoyer un _message au contact..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Enregistrer"
 
@@ -26029,26 +26322,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Supprimer définitivement les messages effacés de tous les dossiers"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Compose un _nouveau message"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Enregistrement du message dans le dossier"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Afficher la fenêtre de prévisualisation de message"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "S'abonner ou se désabonner aux dossiers sur les serveurs externes"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Éditeur de dossier _virtuel..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtres..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Panneau d'_aperçu"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "S'_abonner aux dossiers..."
 
@@ -26147,7 +26450,7 @@ msgstr "List de messages par Fil de discussion"
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Dossier"
 
@@ -26393,174 +26696,189 @@ msgid "P_revious Unread Message"
 msgstr "Message n_on lu précédent"
 
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "Répondre à la tâche"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Vérifie les nouveaux messages dans tous les dossiers"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Message I_mportant précédent"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Prévisualiser le message a imprimer"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Précédent"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Imprimer ce message"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Re_diriger"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Transférer le message sélectionné à un correspondant"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Réinitialiser la taille du texte à sa valeur originale"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Rechercher (dans le message)..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Plus _petit"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Enregistrer le message comme un fichier texte"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Rechercher un texte dans le corps du message affiché"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Paramétrage de la page pour votre imprimante courante"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Afficher le _source du courrier"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Afficher les _en-têtes complets"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Afficher le message en style normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Afficher le message avec toutes les en-têtes"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Afficher la source brute du message"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Taille du texte"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Récupérer les messages sélectionnés"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Dossier virtuel sur la liste de diffusion"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Dossier virtuel sur le sujet"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Joint"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Copier vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Créer un filtre à partir du message"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Faire _suivre le message"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Aller À"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "Dans le corps"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Plus _grand"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Affichage du _message"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "Message _suivant"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Affichage _Normal"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Ouvrir le message"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "Message _précédent"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Cité"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Renommer..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Récupérer"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Fermer cette fenetre"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Fermer"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vue"
 
@@ -26588,169 +26906,161 @@ msgstr "Coder ce message avec votre certificat de cryptage S/MIME"
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Insérer un _fichier texte..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Insère un fichier comme texte dans le message"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Insérer un fichier texte..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Ouvrir"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Encrypter avec PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Signer avec PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Encrypter avec S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Signature S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Enregistrer sous"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Enregistrer le _brouillon"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Enregistrer dans le dossier..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Enregistrer le fichier courant"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Enregistrer le fichier en cours avec un nom différent"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Enregistrer le message dans un dossier spécifié"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Envoyer"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Envoyer plus _tard"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Envoyer plus _tard"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Envoyer le message au format HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Envoyer le message plus tard"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Envoyer ce message maintenant"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Afficher / Cacher les pièces-jointes"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Afficher les _pièces-jointes"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Afficher les pièces-jointes"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer ce message avec votre clé PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signer ce message avec votre certificat de signature S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Indique si le champ Bcc est affiché"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Indique si le champ Cc est affiché"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Indioque si le choix « De : » est affiché"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Commute si le champ Reply-To est affiché"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Pièce-jointe..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Champ _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Champ _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Supprimer tout"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Champ _From"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Insérer"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Champ _Répondre À"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Enregistrer le contact et fermer la boîte de dialogue"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "A_ide"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Signature"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ajouter le dossier à votre liste de dossier abonnés"
@@ -26844,170 +27154,201 @@ msgid "Add to _Shortcut Bar"
 msgstr "_Ajouter à la barre de raccourcis"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Alarme d'Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Changer le nom de ce dossier"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copier ce dossier"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "_Créer un nouveau dossier..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Créer un lien de ce dossier dans la barre de raccourcis"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Créer un nouveau dossier"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Créer un nouveau raccourci"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Créer un nouveau dossier"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Supprimer ce dossier"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afficher un dossier différente"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Fenêtre Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importer les données d'autres programmes"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Déplacer ce dossier à un autre endroit"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "_Créer un nouveau dossier..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Envoyer ce dossier dans une autre fenêtre"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Paramétrage du Pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Env./Recevoir"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr "Envoyer les éléments en attente et récupèrer les nouveaux"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configuration de la messagerie"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Afficher les informations concernant Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Commuter"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuter l'affichage de la barre de dossiers"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuter l'affichage de la barre de raccourcis"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Commuter si travail Hors ligne"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Voir le dossier sélectionné"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "FAQ Ximian Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "À _propos de Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copier..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Barre de _dossier"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Dossier"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Déplacer..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nouveau dossier"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Paramétrage du Pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Préférences du courrier"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "Envoyer/Recevoir"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Raccourci"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Barre de _raccourcis"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Raccourci"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimer résumé"
@@ -27021,17 +27362,40 @@ msgid "Reload the view"
 msgstr "Recharger la vue"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Cartes Adresse"
+#, fuzzy
+msgid "By _Company"
+msgstr "Par Société"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Par Société"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Cartes Adresse"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Liste de téléphones"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vue hebdomadaire"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Vue journalière"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Vue mensuelle"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vue hebdomadaire de travail"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Sélectionnez un Dossier"
@@ -27056,13 +27420,19 @@ msgstr "Par Sujet"
 msgid "Messages"
 msgstr "Messages"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Avec catégorie"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tâche"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27214,11 +27584,11 @@ msgstr "Codage caractères"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Éditeur de recherche"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Enregistrer la recherche"
 
@@ -27256,19 +27626,19 @@ msgstr "Message"
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "_Trouver maintenant"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr "_Effacer"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Tous"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Trouver maintenant"
 
@@ -27282,18 +27652,168 @@ msgstr "Le serveur de carnet d'adresses personnel"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Le serveur de calendrier personnel; utilitaire de calendrier"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs() : Ne peut initialiser GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba() : Ne peut initialiser GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution ne peut pas accéder au stockage local du carnet d'adresses.\n"
+#~ "Ceci peut être du à un plantage du composant evolution-addressbook.\n"
+#~ "Pour nous aider à comprendre et corriger ce problème, veuillez envoyer\n"
+#~ "un courrier à Jon Trowbridge <trow@ximian.com> avec une déscritpion "
+#~ "détaillée\n"
+#~ "des circonstances sous lesquelles cette erreur est survenue. \n"
+#~ "Merci."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution ne peut pas accéder au stockage local du carnet\n"
+#~ "d'adresses. Cela ne devrait jamais arriver en temps normal.\n"
+#~ "Vous devrez peut-être redémarrer Evolution pour résoudre ce\n"
+#~ "problème."
+
+#~ msgid "_Browse..."
+#~ msgstr "_Parcourir..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "L'état de la réunion a changé. Envoyer une version corrigée ?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Supprimer ce rendez-vous"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Émetteur : %s\n"
+#~ "Sujet : %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "Erreur de protocole SASL"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "Erreur d'E/S : %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Erreur du message de bienvenue : %s : sûrement pas grave"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Demande HELO dépassée : %s non fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Erreur réponse HELO : %s non fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Réponse QUIT dépassée : %s / non fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Insérer un fichier"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Vous avez choisi une date invalide."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "La date du message sera comparée quelle que soit l'heure où\n"
+#~ "le filtre est lancé ou le dossier virtuel ouvert."
+
+#~ msgid "Command"
+#~ msgstr "Commande"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editeur de News d'Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Êtes-vous sûr de vouloir supprimer ce compte de nouvelles ?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Vous devez configurer un compte avant de pouvoir envoyer ce message."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Serveur NNTP :"
+
+#~ msgid "News Servers"
+#~ msgstr "Serveurs de nouvelles"
+
+#~ msgid "Source"
+#~ msgstr "Source"
+
+#~ msgid "Source Information"
+#~ msgstr "Informations de source"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Enregistrer sur le disque..."
+
+#~ msgid "View messages..."
+#~ msgstr "Voir les messages..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Exécution de la commande : %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Créez un nouveau dossier"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Le type du dossier sélectionné n'est pas valide pour\n"
+#~ "l'opération demandée."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Vous ne pouvez importer que vers des dossiers locaux"
+
+#~ msgid "_Contact List"
+#~ msgstr "Liste de Contacts"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Insérer un _fichier texte..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insère un fichier comme texte dans le message"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Insérer un fichier texte..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Envoyer plus _tard"
+
+#~ msgid "Send _later"
+#~ msgstr "Envoyer plus _tard"
+
+#~ msgid "Send the message later"
+#~ msgstr "Envoyer le message plus tard"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Paramétrage du Pilot..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Sources du carnet d'adresses"
@@ -27441,9 +27961,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "Same as text"
 #~ msgstr "Même chose en texte"
 
-#~ msgid "Select a signature file"
-#~ msgstr "Sélectionnez un fichier de signature"
-
 #~ msgid "Select a signature script"
 #~ msgstr "Sélectionnez un script de signature"
 
@@ -27645,9 +28162,6 @@ msgstr "init_bonobo() : Ne peut initialiser Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation :"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Se _souvenir du mot de passe"
-
 #~ msgid "_Reply-To:"
 #~ msgstr "_Répondre-À :"
 
diff --git a/po/ga.po b/po/ga.po
index aa18555bf6..005c482dce 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: locales 0.01\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-01-25 14:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "File As"
 msgstr "S�bh�il Mar"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ainm"
@@ -343,45 +343,45 @@ msgstr "VCard do %s"
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Ag Cuardaigh..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Ag L��d��il..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Te�p ag fork: %s"
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Tadhalla�"
 
@@ -493,23 +493,32 @@ msgstr "Freastala� LDAP"
 msgid "LDAP server containing contact information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Tadhall Nua"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Tadhall"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Scr�os an sceal seo"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "L��osta Tadhall Nua"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Liost Tadhall"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Tadhall Nua"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Tadhall"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Scr�os an sceal seo"
 
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
@@ -527,24 +536,24 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr ""
 
@@ -552,18 +561,18 @@ msgstr ""
 msgid "Other Contacts"
 msgstr "Tadhalla� Eile"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -571,49 +580,49 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Pasfhocal do %s, le do thoil (�s�ideoir %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Rphost 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -740,7 +749,7 @@ msgstr ""
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -834,8 +843,8 @@ msgstr "Socr�"
 msgid "Mappings"
 msgstr "An tS�n"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_gach"
@@ -888,8 +897,8 @@ msgstr ""
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Cuardaigh"
 
@@ -1076,15 +1085,15 @@ msgid "Using email address"
 msgstr "Seoladh Rpost:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Suimigh"
 
@@ -1133,12 +1142,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Eagar"
@@ -1252,10 +1261,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Scr�os"
 
@@ -1284,32 +1293,14 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid "Find contact in"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "T�g Tadhalla� o Leabhar Seoladh"
 
+#: addressbook/gui/component/select-names/e-select-names.c:544
+msgid "Find contact in"
+msgstr ""
+
 # FIXME SP?
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
@@ -1332,15 +1323,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Bog..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Saghas:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Filltea�n:"
 
@@ -1451,11 +1437,12 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Dealaigh"
 
@@ -2899,7 +2886,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Scr�os"
 
@@ -2959,7 +2946,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr ""
 
@@ -2987,21 +2974,21 @@ msgid "Error getting book view"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "iEarraidh gan Aithne"
 
@@ -3009,8 +2996,8 @@ msgstr "iEarraidh gan Aithne"
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr ""
 
@@ -3027,7 +3014,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -3050,48 +3037,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Leabhar Seoladh:"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Taispea�n"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3099,22 +3091,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Gan carta�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Gan carta�"
@@ -3187,7 +3179,7 @@ msgstr "Leabhar Seoladh:"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "S�bh�il mar VCard"
 
@@ -3227,7 +3219,7 @@ msgid "Pilot Settings..."
 msgstr "Albachta� Phoist"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
@@ -3237,8 +3229,8 @@ msgstr ""
 
 # fa 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Priont�il"
@@ -3258,7 +3250,7 @@ msgid "Move to folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
@@ -3269,20 +3261,20 @@ msgid "Copy"
 msgstr "C�ip"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Dealaigh"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Radharc Carta"
@@ -3439,7 +3431,7 @@ msgstr ""
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Roghanna"
 
@@ -3529,26 +3521,26 @@ msgstr ""
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Ard"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Gn�th"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Bun"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
@@ -3676,11 +3668,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "Eagar coinne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3688,13 +3680,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3705,7 +3697,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -3733,7 +3725,7 @@ msgstr ""
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3744,7 +3736,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "aa %d %b"
 
@@ -3766,17 +3758,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priobhdach"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3801,37 +3793,37 @@ msgstr ""
 msgid "W"
 msgstr "I"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Saor"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Cr�ochnaithe"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3839,56 +3831,55 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "T�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "N�l"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Radharc L�"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Radharc Seachtain"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Radharc M�"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Feilire"
 
@@ -3897,12 +3888,12 @@ msgid "Folder containing appointments and events"
 msgstr ""
 
 # tg
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Teascanna"
 
@@ -3910,44 +3901,64 @@ msgstr "Teascanna"
 msgid "Folder containing to-do items"
 msgstr ""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Coinne Nua"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Coinne"
+
+#: calendar/gui/component-factory.c:709
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Cruthaigh Coinne _Nua"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "�lbachta�"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Scr�os an sceal seo"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Teasc"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+#, fuzzy
+msgid "Create a new task"
+msgstr "Cruthaigh _Teasc Nua"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Coinne Nua"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "New appointment"
-msgstr "Coinne Nua"
-
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "Coinne"
+msgid "Create a new all-day appointment"
+msgstr "Cruthaigh Coinne _Nua"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -4012,7 +4023,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "lae"
 
@@ -4021,11 +4033,13 @@ msgid "extra times every"
 msgstr ""
 
 # xh
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "noimea�d"
 
@@ -4154,7 +4168,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimri�:"
 
@@ -4183,7 +4197,7 @@ msgstr "deireadh an coinne"
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4360,7 +4374,7 @@ msgid "_Fri"
 msgstr "_Aoi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr ""
 
@@ -4403,19 +4417,33 @@ msgstr "_Cea"
 msgid "before every appointment"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
@@ -4483,61 +4511,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Teasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Gan coimri�"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4737,7 +4765,7 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4749,7 +4777,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "St�das"
@@ -4834,7 +4862,7 @@ msgstr ""
 msgid "first"
 msgstr "l�osta"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "soic�nd"
 
@@ -4858,7 +4886,7 @@ msgstr "l�osta"
 msgid "Other Date"
 msgstr "Facs Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "l�"
 
@@ -4958,20 +4986,26 @@ msgstr "% Rinneadh:"
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Freagra"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "Tosa�ocht"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_St�das:"
 
@@ -4985,7 +5019,7 @@ msgstr "Gn�th"
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5054,84 +5088,84 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Osc�il"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "S�nbh�il le..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Priont�il..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_C�ip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Liong�ilis"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "% Rinneadh:"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr ""
@@ -5146,8 +5180,8 @@ msgstr ""
 msgid "Alarms"
 msgstr "Af�iris"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr ""
 
@@ -5175,11 +5209,9 @@ msgstr "Tosa�ocht"
 msgid "Start Date"
 msgstr ""
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Coimri�"
 
@@ -5218,110 +5250,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "rn"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "in"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "_Coinne Nua"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bealach Nuacht�in"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Teasc Nua"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Cl�d�il..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Socraigh Fillte�in..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Socraigh Fillte�in..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_S�bh�il Mar..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Ag Fanacht..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Ag L�d�il feilire..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5371,7 +5402,7 @@ msgstr "Cr�ochnaithe.`"
 msgid "Task Due: <b>"
 msgstr "Cr�ochnaithe.`"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "eolas fheilire"
@@ -5382,351 +5413,356 @@ msgstr "eolas fheilire"
 msgid "iCalendar Error"
 msgstr "Feilire"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "iEarraidh gan Aithne"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Fillte�n _Nua"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_St�das:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Gan Aithne"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "Cuntas"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Dealaigh"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Eolas Theasc"
 
 # FR
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "An Fhrainc"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "_Dealaigh gach rud"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "�lbachta�"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Eolas"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Freagrair"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Post an sce�l seo"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Fillte�n _Nua"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Fillte�n _Nua"
@@ -5775,7 +5811,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr "Cathlaoirlaig"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr ""
 
@@ -5789,59 +5825,54 @@ msgstr ""
 
 # IN 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Pearsanta"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupa"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Goireas"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Seomra"
 
 # th
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Chair"
 msgstr "T�alainnis"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Freagra"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr ""
 
@@ -5931,48 +5962,45 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Te�p ag fork: %s"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Scr�os an sceal seo"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Coinne Nua..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr ""
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5983,11 +6011,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Osc�il Feilire"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Ag oscailt an t-eolaire %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aibre�in"
@@ -6052,58 +6085,63 @@ msgstr "D. F�mhair"
 msgid "September"
 msgstr "M. F�mhair"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Eolas Theasc"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Eolas Cuntais"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Eolas"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "eolas fheilire"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Freagrair"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Te�p ag fork: %s"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -6339,9 +6377,8 @@ msgid "Print Calendar"
 msgstr "Priont�il Feilire"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Priont�il Reamhtaispe�ntais"
 
@@ -6370,8 +6407,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr ""
 
@@ -6424,127 +6461,137 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Teachtaireacht Feilire"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Feilire"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8197,73 +8244,81 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "ag sioncronaich filtean"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "_Post sce�l"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8316,7 +8371,7 @@ msgstr "Post an sce�l seo"
 msgid "Copying messages"
 msgstr "Post an sce�l seo"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8324,45 +8379,45 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 msgid "No data provided"
 msgstr ""
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8370,18 +8425,18 @@ msgid ""
 "%.*s"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "_Post sce�l"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8407,22 +8462,22 @@ msgid "Could not lock '%s'"
 msgstr "Te�p ag fork: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8481,11 +8536,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8606,7 +8665,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8778,26 +8837,125 @@ msgstr "Te�p ag fork: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "T�g Comhad"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+msgid "Error in CRL"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "As an Oifig"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Invalid purpose"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8806,16 +8964,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8830,32 +9000,39 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr ""
+"Earraidh ag s�bhh�il sc�ala� do: %s\n"
+" %s"
+
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Ni raibh aon sceal %s i %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Fillte�n _Nua"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Te�p ag fork: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Te�p ag fork: %s"
@@ -8863,12 +9040,12 @@ msgstr "Te�p ag fork: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8897,41 +9074,41 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8940,10 +9117,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr ""
@@ -8956,7 +9133,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Fillte�in"
 
@@ -8986,7 +9163,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Pasfhocal"
 
@@ -8994,70 +9171,74 @@ msgstr "Pasfhocal"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, c-format
+msgid "The folder %s no longer exists"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9065,31 +9246,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9111,7 +9298,9 @@ msgid "Local delivery"
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9138,12 +9327,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9154,38 +9343,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9243,7 +9432,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9279,25 +9468,25 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Ag S�bh�il scealta"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ag stoir filtean"
@@ -9339,35 +9528,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9382,64 +9571,64 @@ msgstr "Te�p ag fork: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Earraidh gan aithne: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9587,49 +9776,49 @@ msgstr "An Fhrainc"
 msgid "Operation failed: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Ceangailte"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Scr�os an sceal seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "iEarraidh gan Aithne"
@@ -9647,7 +9836,7 @@ msgstr ""
 msgid "Delete after %s day(s)"
 msgstr "Scrios indiath %s la(e)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9668,6 +9857,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Te�p ag fork: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9677,50 +9871,52 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Te�p ag fork: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Earraidh I/A"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Te�p ag fork: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 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:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9745,35 +9941,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9881,41 +10077,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9923,89 +10118,89 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP freastala� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 #, fuzzy
 msgid "Sending message"
 msgstr "Post an sce�l seo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Earraidh Eile"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10013,86 +10208,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "iat�n"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -10112,121 +10307,133 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr ""
 
-# om
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "�:"
-
 #.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr ""
 
+# om
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "�:"
+
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Poirt:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Te�p ag fork: %s"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Rabhadh!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10235,71 +10442,67 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Osc�il Comhad"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr ""
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
 # SG
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Singeap�r"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (gn�th)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10362,19 +10565,18 @@ msgstr ""
 msgid "Subject does not contain"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10483,251 +10685,274 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "bliain"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "bliana"
-
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "soicind"
 
-#: filter/filter-datespec.c:81
-msgid "months"
+#: filter/filter-datespec.c:71
+msgid "minute"
 msgstr ""
 
-#: filter/filter-datespec.c:82
+# ug
+#: filter/filter-datespec.c:72
+#, fuzzy
+msgid "hour"
+msgstr "��ghur"
+
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "seachtain"
 
 # el 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 #, fuzzy
 msgid "weeks"
 msgstr "seachtin"
 
-# ug
-#: filter/filter-datespec.c:84
-#, fuzzy
-msgid "hour"
-msgstr "��ghur"
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr ""
-
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "soicind"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�"
 
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr ""
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "bliain"
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "bliana"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
 msgstr ""
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr ""
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "anois"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Fillte�n _Nua"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "anois"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Ainm St�l:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "N�l aon Eolaire `%s' ann."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Fillte�n _Nua"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 #, fuzzy
 msgid "Select Folder"
 msgstr "Fillte�n _Nua"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+# IR
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Ag Obair"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Gn�th"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "Bainisteoir"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 #, fuzzy
 msgid "Test"
 msgstr "An Tib�id"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Gan Tid�al"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Edit Filters"
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 msgstr ""
 
 #: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr ""
+
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10755,43 +10980,42 @@ msgid "Beep"
 msgstr "An Bheilg"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Teoranta"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr ""
 
 # mt
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Scr�oste"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr ""
 
+#: filter/libfilter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
@@ -10813,93 +11037,87 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-# IR
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "riomh"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "_Larger"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr ""
 
+#: filter/libfilter-i18n.h:40
+msgid "Pipe Message to Shell Command"
+msgstr ""
+
 # PL
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "An Pholainn"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr ""
 
@@ -10915,58 +11133,87 @@ msgstr ""
 msgid "Replied to"
 msgstr ""
 
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "GN"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
 # Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Sc�r"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Teoranta"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "M�id (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr ""
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Abair"
 
-#: filter/rule-editor.c:179
+# US
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "St�it Aontaithe Mheirice�"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr ""
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr ""
 
@@ -10974,12 +11221,12 @@ msgstr ""
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "_Fillte�n"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10987,31 +11234,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "F�n le do thoil"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Ag Oscailt '%s'"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Post"
 
@@ -11068,39 +11315,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Bruscar"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ag Oscailt '%s'"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "�lbachta�"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Fillte�n"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11175,12 +11422,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "Roghanna Feilire"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Cuntasa�"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Roghanna Feilire"
@@ -11229,65 +11476,85 @@ msgstr "�lbachta�..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Teachaireacht Post Nua"
 
 # mt
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Sc�al R�omhphost"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Cruthaigh Sc�al _Nua"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Sce�l Nua"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Post an sce�l seo"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Teachaireacht Post Nua"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ag Cealaigh..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Albachta� do \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "�lbacta�"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -11338,132 +11605,132 @@ msgstr "%d �oml�n"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Fillte�n _Nua"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Priont�il"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Freagrair do L�osta"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cr�ochnaithe"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Glan"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Athdealaigh"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Suim Leabhar Seoladh"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Teachtaireacht Feilire"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr ""
@@ -11525,76 +11792,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Eagarth�ir Nuachr�in Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_�st:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Ainm _�saideoir"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Sl�:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "M�chumasach"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Chumasach"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Ainm _Chuntas:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portr�id"
@@ -11604,30 +11862,30 @@ msgstr "Portr�id"
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Abair is %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Sc�al � %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "l�osta r�omhphost %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11635,7 +11893,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11643,132 +11901,128 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Post ar aon n�s?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Am %a, %Y-%m-%d ag %H:%M, scr�obh %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr ""
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "S�bh�il Sc�al Mar..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "S�bh�il Sc�ala Mar..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Scr�os an sceal seo"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11776,36 +12030,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr ""
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11826,7 +12080,7 @@ msgstr "(Gan Tuarascail)"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr ""
 
@@ -11848,15 +12102,14 @@ msgstr "Singeap�r"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11866,59 +12119,33 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Ag Obair"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Gn�th"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "Bainisteoir"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cuntas"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12165,433 +12392,417 @@ msgstr "S�bh�il agus D�n"
 msgid "Loading Images"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�it do Bosca Phoist"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Scr�obh�ir"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Post sce�l"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Freatala� NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Socr� Post"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Fillte�n _Nua"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Eagr�:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "T�g dath"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Priont�il an tadhalla� seo"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Freagrair-Do"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "_Roghanna"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Remember this _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Gn�th"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sl�nd�il"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
 # FIXME SP?
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "T�g Ainmh�:"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "_Post sce�l filtean"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr ""
 
 # SG
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Singeap�r"
 
 # SG
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Singeap�r"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ainm St�l:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr ""
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_St�das:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Saghas _Udar� :"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Gn�th"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Ainm _Fhada:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "i HTML post"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Freagrair do gach rud"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sl�nd�il"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Post r�omhphost"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_St�das:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Luaineach"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_gach"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " dath"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr ""
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12615,226 +12826,236 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr ""
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "_Iat�n"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Osc�il san %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Post an sce�l seo"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr ""
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr ""
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "S�bh�il Iomha le..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�ta"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Droch Seoladh"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "�"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Freagrair-Do"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Do"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Clodaigh teachtairecht..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "_Fillte�n"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr ""
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Te�p ag fork: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
 # c-format
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Ag Obair"
 
@@ -12843,108 +13064,108 @@ msgstr "Ag Obair"
 msgid "Filtering Folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Post an sce�l seo"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Cr�ochnaithe.`"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillte�n %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Fillte�n _Nua"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "_Post sce�l"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ag S�bh�il scealta"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12953,38 +13174,33 @@ msgstr ""
 "Earraidh ag s�bhh�il sc�ala� do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "C_uardaigh..."
 
@@ -13040,32 +13256,41 @@ msgstr "Sl�: %s, Cin�al: %s"
 msgid "Type: %s"
 msgstr "Cin�al:  %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr ""
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Cealaigh gach rud"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Scr�os an teasc seo"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
@@ -13089,7 +13314,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Ainm:"
 
@@ -13120,7 +13345,7 @@ msgstr ""
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr ""
 
@@ -13134,7 +13359,7 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13143,95 +13368,98 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Fillte�in"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Fillte�n _Nua"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Gan abair)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Sce�l"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Inni� %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Inn� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr ""
 
@@ -13265,49 +13493,49 @@ msgstr ""
 msgid "Size"
 msgstr "M�id"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Post"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Gan Eolas"
 
 # NO
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 #, fuzzy
 msgid "Forward"
 msgstr "Sheoladh"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Freagrair do gach rud"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Reamhthaispe�intas"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13331,16 +13559,16 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Fillte�n"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18370,11 +18598,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24400,8 +24628,8 @@ msgstr "(Gan Tuarascail)"
 msgid "Mail summary"
 msgstr "Coimri� phoist"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Fillte�n"
@@ -24420,15 +24648,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Focal do Lae"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24440,28 +24668,28 @@ msgstr ""
 msgid "News Feed"
 msgstr "Bealach Nuacht�in"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "Gach Rud"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Suimigh"
 
 # SE
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "An tSualainn"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Gan Teascanna"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Gan Tuarascail)"
 
@@ -25745,8 +25973,9 @@ msgid "Tasks "
 msgstr ""
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Albachta� Phoist"
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -25806,7 +26035,7 @@ msgstr "Taisp�an Sonra�"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25819,21 +26048,21 @@ msgid "Add a Folder"
 msgstr "Fillte�n _Nua"
 
 # DE
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "An Ghearm�in"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Asbosca"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Post"
@@ -26037,20 +26266,15 @@ msgid ""
 msgstr ""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Cruthaigh fillte�n nua"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nua..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(gan tide�l)"
 
@@ -26067,7 +26291,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -26093,104 +26317,100 @@ msgstr ""
 msgid "Select importer"
 msgstr "Fillte�n _Nua"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr ""
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Ainm Chomad:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "T�g Comhad"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Cin�al Comhad:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "� %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "T�g Fillte�n"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -26238,8 +26458,13 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "in \"%s\" ..."
 msgstr "Osc�il san %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Te�p ag fork: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+msgid "Cannot find the specified shared folder."
 msgstr ""
 
 #: shell/e-shell-startup-wizard.c:159
@@ -26253,8 +26478,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "_Nua"
@@ -26296,55 +26521,55 @@ msgstr ""
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "Scr�os an sceal seo"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Sheoladh Chuig duine"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Ar Bith)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26352,12 +26577,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26365,141 +26590,151 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Ainm Grupa:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Grupa _Nua..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Scr�os an sceal seo"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Scr�os an sceal seo"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Post an sce�l seo"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Scr�os"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr ""
 
@@ -26509,55 +26744,55 @@ msgstr ""
 msgid "Checkbox"
 msgstr "T�alainnis"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Gan Earraidh"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Earraidh I/A"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Te�p ag fork: %s"
@@ -26602,63 +26837,63 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Earraidh CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Idirbhr�ste"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Gan �in�ar"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Earraidh Intire"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Post an sce�l seo"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26683,6 +26918,29 @@ msgstr "�st"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Feilire"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr ""
+"\n"
+"Tr�cht:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Post"
+
+# tg
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Teascanna"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ainm Fillte�n:"
@@ -26695,6 +26953,34 @@ msgstr "Saghas Fillte�n:"
 msgid "Specify where to create the folder:"
 msgstr ""
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Fillte�n _Nua"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Ainm Fillte�n:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Ainm _Freastala�:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Ainm _�saideoir"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -26779,15 +27065,15 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr ""
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26807,7 +27093,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26815,46 +27101,46 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr ""
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
@@ -26892,119 +27178,113 @@ msgstr ""
 msgid "Copy to Folder..."
 msgstr "_C�ip do Fillte�n..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Scr�os an tadhalla� seo"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Priont�il reamh-taispe�ntas"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Priont�il an tadhalla� seo"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "S�bh�il an tadhalla� seo mar VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "T�g Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "T�g Gach tadhalla�"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "_Post sce�l"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Post sce�l do tadhall"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Post tadhalla� seo do perseanta eile."
 
 # st
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stad"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Liost Tadhall"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_S�bh�il Mar VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_T�g Gach Rud"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "_Post sce�l do Tadhall..."
@@ -27051,11 +27331,6 @@ msgstr "M�"
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Priont�il reamh-taispe�ntas"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Priont�il an feilire seo"
@@ -27088,7 +27363,7 @@ msgstr "Seachtain"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "D�n"
 
@@ -27101,7 +27376,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -27113,8 +27388,8 @@ msgstr ""
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "S�bh�il"
 
@@ -27139,9 +27414,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Comhad"
 
@@ -27151,7 +27426,7 @@ msgstr ""
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "S�bh�il _Mar..."
 
@@ -27166,8 +27441,8 @@ msgstr "_Post sce�l do Tadhall..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_S�bh�il"
 
@@ -27264,26 +27539,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Sce�l Nua"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "S�bh�il 'san _fillte�n"
@@ -27387,7 +27672,7 @@ msgstr "Post an sce�l seo"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Fillte�n"
 
@@ -27659,188 +27944,203 @@ msgstr "Post an sce�l seo"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Freagrair"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Fillte�n _Nua"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Riomh"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Clodaigh teachtairecht seo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Scr�os an sceal seo"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "_Iat�n"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "_Fillte�n"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Sheoladh Chuig duine"
 
 # PE
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "_Post sce�l"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Sc�al ar Lean"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Taispea�n _Gn�th"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Oscail Teachtaireacht"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sheoladh Chuig duine"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Osc�il..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Uirlis�"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Athdealaigh"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "D�n an fhuinneog seo"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_D�n"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Radharc"
 
@@ -27868,175 +28168,165 @@ msgstr ""
 msgid "For_mat"
 msgstr "_Form�id"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Osc�il"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "S�bh�il Mar"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save in folder..."
 msgstr "S�bh�il 'san _fillte�n"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Post"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Post an sce�l seo i HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-#, fuzzy
-msgid "Send the message later"
-msgstr "Post an sce�l seo"
-
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Send this message now"
+msgid "Send this message"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "_Coinne"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Taispe�n iat�ni"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Iat�n"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Dealaigh gach rud"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Osc�il..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save the current file and close the window"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "C_�idi�"
 
+# SG
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Singeap�r"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -28134,173 +28424,203 @@ msgid "Add to _Shortcut Bar"
 msgstr ""
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "_Fillte�n"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Create _New Folder..."
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Scr�os an sceal seo"
+
+#: ui/evolution.xml.h:12
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_�irigh as"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Fuinneog Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "�irigh as an r�omhchl�r"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Oscail 'san Fhuinneog Nua"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Post an sce�l seo"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Albachta� Phoist"
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Socr� Post"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Faoi Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_C�ip..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Fillte�n"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr ""
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "Chl�_fhoireann..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Bog..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Fillte�n _Nua"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "Albachta� Phoist"
+msgid "_Preferences..."
+msgstr "Roghanna Feilire"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr ""
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr ""
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr ""
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Faoi..."
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr ""
@@ -28317,16 +28637,38 @@ msgstr ""
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
-msgid "Address Cards"
-msgstr "Carta� Sheoladh"
+msgid "By _Company"
+msgstr "_Teoranta:"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr ""
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Carta� Sheoladh"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
+#, fuzzy
+msgid "_Phone List"
+msgstr "Liost Tadhall"
+
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Radharc Seachtain"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Radharc L�"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Radharc M�"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Radharc Seachtain"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
@@ -28355,13 +28697,19 @@ msgstr ""
 msgid "Messages"
 msgstr "Asaimis"
 
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
+msgstr "_Saghas:"
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Teasc"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28524,11 +28872,11 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr ""
 
@@ -28568,20 +28916,20 @@ msgstr "Sce�l"
 msgid "Don't show this message again."
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Glan"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr ""
 
@@ -28595,21 +28943,50 @@ msgstr ""
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr ""
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr ""
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Leabhar Seoladh:"
+#~ msgid "_Browse..."
+#~ msgstr "_Bog..."
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Earraidh I/A"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Eagarth�ir Nuachr�in Evolution"
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Freatala� NNTP:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Fillte�n _Nua"
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Clodaigh teachtairecht..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Cruthaigh fillte�n nua"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Post an sce�l seo"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Albachta� Phoist"
 
 #~ msgid "_End of day:"
 #~ msgstr "_Deireadh an L�:"
@@ -28674,10 +29051,6 @@ msgstr ""
 #~ msgstr "Taispe�in"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "T�g Comhad"
-
-#, fuzzy
 #~ msgid "_Filename:"
 #~ msgstr "Ainm Chomad:"
 
@@ -28723,9 +29096,6 @@ msgstr ""
 #~ msgid "_Other"
 #~ msgstr "_Eile"
 
-#~ msgid "_Delete this Task"
-#~ msgstr "Scr�os an teasc seo"
-
 #, fuzzy
 #~ msgid "Free/Busy information (%s to %s)"
 #~ msgstr "Eolas"
@@ -28820,20 +29190,10 @@ msgstr ""
 #~ msgid "Create a New All Day _Event"
 #~ msgstr "Cruthaigh All Day Event nua"
 
-#~ msgid "Create a New _Task"
-#~ msgstr "Cruthaigh _Teasc Nua"
-
-#~ msgid "Create a _New Appointment"
-#~ msgstr "Cruthaigh Coinne _Nua"
-
 #, fuzzy
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Cruthaigh Coinne _Nua"
 
-#, fuzzy
-#~ msgid "Create a new meeting request"
-#~ msgstr "Scr�os an sceal seo"
-
 #~ msgid "New Appointment"
 #~ msgstr "Coinne Nua"
 
@@ -28846,9 +29206,6 @@ msgstr ""
 #~ msgid "_Task..."
 #~ msgstr "_Teasc..."
 
-#~ msgid "New Message"
-#~ msgstr "Sce�l Nua"
-
 #~ msgid "Show All"
 #~ msgstr "Taispe�n gach Rud"
 
@@ -29044,9 +29401,6 @@ msgstr ""
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%a %d/%m/%Y"
 
-#~ msgid "_Company:"
-#~ msgstr "_Teoranta:"
-
 #~ msgid "SASL"
 #~ msgstr "SASL"
 
@@ -29170,9 +29524,6 @@ msgstr ""
 #~ msgid "Print S_etup..."
 #~ msgstr "Socraigh Priont�il..."
 
-#~ msgid "_About..."
-#~ msgstr "_Faoi..."
-
 #, fuzzy
 #~ msgid "_Mail Message (FIXME)"
 #~ msgstr "_Post sce�l"
diff --git a/po/gl.po b/po/gl.po
index bcfe91f993..55da36521a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -43,7 +43,7 @@ msgstr "Importa ficheiros VCard a Evolution."
 msgid "File As"
 msgstr "Arquivar coma"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome:"
@@ -368,53 +368,53 @@ msgstr "VCard de %s"
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "Erro ao executar a expresi�n de busca: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "Conectando ao servidor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "Eliminando as tarxetas..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -508,11 +508,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -530,23 +530,32 @@ msgstr "Servidor NNTP:"
 msgid "LDAP server containing contact information"
 msgstr "Cartafol que cont�n informaci�n de contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Novo Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Contacto"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crear un novo contacto"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _Contactos"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Novo Contacto"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Contacto"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crear unha nova lista de contactos"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -572,30 +581,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, 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:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, 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-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non est� soportado nesta versi�n de evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Non foi posible inicializar gnome-vfs"
 
@@ -603,11 +612,11 @@ msgstr "Non foi posible inicializar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Outros Contactos"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -617,7 +626,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP est�\n"
 "f�ra de servicio"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -629,7 +638,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -637,44 +646,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Correo Electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "A categor�a �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo cont�n"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avanzado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Calquera Categor�a"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que ha amosar o Navegador de Cartafoles"
 
@@ -797,7 +806,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -891,8 +900,8 @@ msgstr "Configuraci�n do Correo"
 msgid "Mappings"
 msgstr "Marxes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
@@ -946,8 +955,8 @@ msgstr "�mbito da busca:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
@@ -1139,15 +1148,15 @@ msgid "Using email address"
 msgstr "_Este � o enderezo de correo"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Engadir"
 
@@ -1193,12 +1202,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editar"
@@ -1316,10 +1325,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1350,33 +1359,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Seleccionar Contactos do Libro de Enderezos"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Buscar un contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Seleccionar Contactos do Libro de Enderezos"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Seleccionar Nomes"
@@ -1398,15 +1389,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Mover..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categor�a:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "Carta_fol:"
 
@@ -1518,11 +1504,12 @@ msgstr "Quere recibir correo en _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -2766,7 +2753,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Agochar enderezos cando se env�e correo a esta lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Elimina_r"
 
@@ -2830,7 +2817,7 @@ msgstr ""
 "cartafol.  �Gostar�alle engadilo de todas maneiras?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
@@ -2858,21 +2845,21 @@ msgid "Error getting book view"
 msgstr "Erro ao iniciar %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�xito"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Erro desco�ecido"
 
@@ -2880,8 +2867,8 @@ msgstr "Erro desco�ecido"
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -2898,7 +2885,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2921,48 +2908,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�Quere gardar os cambios?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Amosar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Amosar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2970,22 +2962,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sen tarxetas"
@@ -3058,7 +3050,7 @@ msgstr "Libro de Enderezos"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
@@ -3098,7 +3090,7 @@ msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
@@ -3107,8 +3099,8 @@ msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -3128,7 +3120,7 @@ msgid "Move to folder..."
 msgstr "_Mover � Cartafol.."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
@@ -3139,20 +3131,20 @@ msgid "Copy"
 msgstr "Copiar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Eliminar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -3321,7 +3313,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opci�ns"
 
@@ -3412,26 +3404,26 @@ msgstr "_Editar cita"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indefinida"
@@ -3559,11 +3551,11 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Non hai unha descrici�n dispo�ible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3571,13 +3563,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3588,7 +3580,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
@@ -3618,7 +3610,7 @@ msgstr "A descrici�n cont�n"
 msgid "Comment contains"
 msgstr "O comentario cont�n"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Non concorda"
 
@@ -3629,7 +3621,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3651,19 +3643,19 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Non foi posible crear o visor da axenda. Comprobe a s�a configuraci�n de "
 "ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3688,37 +3680,37 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completada"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3729,56 +3721,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Asignada"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Si"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Non"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Vista Diaria"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Vista de Semana Laboral"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vista Semanal"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Vista Mensual"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -3786,12 +3777,12 @@ msgstr "Axenda"
 msgid "Folder containing appointments and events"
 msgstr "Cartafol que cont�n citas e eventos"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3799,44 +3790,62 @@ msgstr "Tarefas"
 msgid "Folder containing to-do items"
 msgstr "Cartafol que cont�n elementos para-facer"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Nova Cita"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cita"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Crear unha nova cita"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuraci�n da Fonte de Novas"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Crear unha nova tarefa"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Nova Cita"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Cita"
+msgid "Create a new all-day appointment"
+msgstr "Crear unha nova cita"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3901,7 +3910,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "d�as"
 
@@ -3909,11 +3919,13 @@ msgstr "d�as"
 msgid "extra times every"
 msgstr "veces cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
@@ -4042,7 +4054,7 @@ msgstr "Recordatorios"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4071,7 +4083,7 @@ msgstr "fin da cita"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4249,7 +4261,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Xeral"
 
@@ -4294,19 +4306,33 @@ msgstr "M�_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Mudou o estado da xuntanza. �Enviar unha versi�n actualizada?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta cita?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�Est� seguro de que quere cancelar e borrar esta entrada de diario?"
 
@@ -4374,61 +4400,61 @@ msgstr " (Pendente "
 msgid "Due "
 msgstr "Pendente "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "�Non foi posible obter a versi�n actual!"
 
@@ -4632,7 +4658,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4644,7 +4670,7 @@ msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4729,7 +4755,7 @@ msgstr "o"
 msgid "first"
 msgstr "Br�tema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
@@ -4753,7 +4779,7 @@ msgstr "Br�tema"
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "d�a"
 
@@ -4853,20 +4879,26 @@ msgstr "% Completo"
 msgid "Date Completed:"
 msgstr "Data Completada:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Precisa dunha Acci�n"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "En Progreso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "E_stado:"
 
@@ -4880,7 +4912,7 @@ msgstr "B�sico"
 msgid "Assignment"
 msgstr "Asignaci�n"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4949,81 +4981,81 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -5032,8 +5064,8 @@ msgstr "Prema para engadir unha tarefa"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Completo"
 
@@ -5061,11 +5093,9 @@ msgstr "Prioridade"
 msgid "Start Date"
 msgstr "Data de _Inicio:"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Resumo"
 
@@ -5107,110 +5137,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Novo _Evento de D�a Completo"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ir � Data..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "_Configurar Cartafol..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "_Configurar Cartafol..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Borrar _T�dalas Ocorrencias"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar o filtro: %s: %s"
@@ -5260,7 +5289,7 @@ msgstr " (Completada "
 msgid "Task Due: <b>"
 msgstr " (Completada "
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informaci�n de axenda"
@@ -5271,13 +5300,13 @@ msgstr "informaci�n de axenda"
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente desco�ecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5285,334 +5314,341 @@ msgstr ""
 "<br> Por favor, olle a seguinte informaci�n, e escolla unha acci�n do men� "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Localizaci�n Xeogr�fica: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desco�ecido"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acci�n"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informaci�n sobre unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a s�a presencia nunha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desexa asistir a unha reuni�n existente."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Actualizaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a reuni�n."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualizaci�n de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respostou a unha petici�n de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reuni�n."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Cancelaci�n da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informaci�n sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> desexa recibir a �ltima informaci�n sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Petici�n de Actualizaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respostou a unha asignaci�n de tarefa."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Resposta � Tarefa"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Cancelaci�n de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informaci�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a s�a informaci�n libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Petici�n de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respostou a unha petici�n de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Actualizaci�n completada\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Eliminaci�n Completa"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "�Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "�Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Seleccionar Cartafol"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Seleccionar Cartafol"
@@ -5658,7 +5694,7 @@ msgstr "data-comezo"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
@@ -5671,57 +5707,52 @@ msgid "Non-Participants"
 msgstr "Non-Participantes"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individual"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Cuarto"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Presidencia"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Precisa dunha Acci�n"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativa"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5811,49 +5842,46 @@ msgstr "Hora do _inicio da reuni�n:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reuni�n:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Non foi posible cargar as tarefas en `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Borrar esta Cita"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5864,11 +5892,16 @@ msgstr "Non foi posible abrir o cartafol en `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo requirido para cargar `%s' non est� soportado"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir axenda"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Abrindo cartafol %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -5925,58 +5958,63 @@ msgstr "outubro"
 msgid "September"
 msgstr "setembro"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Informaci�n da Tarefa"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Informaci�n Opcional"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informaci�n de Libre/Ocupado"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "informaci�n de axenda"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Actualizaci�n de Tarefa"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Actualizar Lista"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Non foi posible inicializar Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Non foi posible crear a f�brica do servicio de notificaci�ns de alarma"
@@ -6208,9 +6246,8 @@ msgid "Print Calendar"
 msgstr "Imprimir Axenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Previsualizaci�n da Impresi�n"
 
@@ -6247,8 +6284,8 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
@@ -6314,17 +6351,29 @@ msgstr "Importa ficheiros VCard a Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa ficheiros VCard a Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Non � posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Non foi posible conectarse � servidor: %s."
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Recordatorio"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensaxe da Axenda"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6333,84 +6382,84 @@ msgstr ""
 "Evolution atopou ficheiros de correo de Pine.\n"
 "�Gostar�alle importalos a Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Axenda"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "o argumento 1 de make-time debe ser unha cadea data/hora ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que o argumento 2 sexa un enteiro"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que o argumento 2 sexa un time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que o argumento 1 sexa unha cadea"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argumento 2 sexa unha cadea"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6418,11 +6467,11 @@ msgstr ""
 "contains? espera que o argumento 1 sexa un de \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera polo menos 1 argumento"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6430,21 +6479,21 @@ msgstr ""
 "has-categories? espera que t�dolos argumentos sexan cadeas ou un e s� un "
 "argumento sexa un falso booleano (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que o argumento 1 sexa un time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A avaliaci�n da expresi�n de b�squeda non produce un valor booleano"
 
@@ -8145,72 +8194,82 @@ msgstr "Creando o cartafol %s"
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando conectado para completar esta operaci�n"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Argumentos non v�lidos"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Argumentos non v�lidos"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
@@ -8271,7 +8330,7 @@ msgstr "Copiando as mensaxes"
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8279,47 +8338,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Non se especificou un nome de cartafol"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, 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:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8327,18 +8386,18 @@ msgid ""
 "%.*s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
@@ -8364,24 +8423,24 @@ msgid "Could not lock '%s'"
 msgstr "Non se puido bloquear '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "A operaci�n expirou tentando obter o ficheiro de bloqueo sobre %s. T�nteo de "
 "novo m�is tarde."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Non se puido obter un bloqueo usando fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
@@ -8440,11 +8499,15 @@ msgstr "Erro ao escribir o ficheiro temporal de correo: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar o ficheiro temporal de correo: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8580,7 +8643,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticaci�n do servidor."
 
@@ -8756,33 +8819,134 @@ msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Non se puido verifica-los certificados."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Expendedor: %s\n"
-"Asunto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Non se puido verifica-los certificados."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Ficheiro de sinatura:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Erro ao cargar %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "F�ra da Oficina"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Non se puido verifica-los certificados."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argumentos non v�lidos"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
-"Certificado incorrecto de %s:\n"
-"\n"
-"%s\n"
-"\n"
-"�Desexa aceptar de todas maneiras?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8791,16 +8955,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Certificado incorrecto de %s:\n"
+"\n"
+"%s\n"
+"\n"
+"�Desexa aceptar de todas maneiras?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8820,36 +9001,41 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Erro ao iniciar %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -8857,12 +9043,12 @@ msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operaci�n cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
@@ -8891,40 +9077,40 @@ msgstr "A resposta do servidor IMAP non conti�a informaci�n sobre %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non est� dispo�ible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo informaci�n de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -8933,10 +9119,10 @@ msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Non foi posible abrir o directorio de cach�: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Non se puido descodifica-la mensaxe."
@@ -8949,7 +9135,7 @@ msgstr "Comprobando o novo correo"
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Cartafoles"
 
@@ -8979,7 +9165,7 @@ msgstr "Para ler e almacenar correo en servidores IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -8988,73 +9174,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opci�n conectarase � servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio %s para %s en %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conexi�n cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaci�n non soportada"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "A autenticaci�n fallou."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "O cartafol `%s' non existe."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, 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:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9065,31 +9255,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9111,7 +9307,10 @@ msgid "Local delivery"
 msgstr "Entrega local"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Para recibir correo local dende spools est�ndar con formato mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9142,13 +9341,13 @@ msgstr "Spools mbox est�ndar de Unix"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Para ler e armacenar correo local en ficheiros spool est�ndar de tipo mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9159,38 +9358,38 @@ msgstr "A ra�z de almacenamento %s non � unha ruta absoluta"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non te�en un inbox"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Non foi posible borrar o ficheiro de �ndice de cartafol `%s': %s"
@@ -9251,7 +9450,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9289,26 +9488,26 @@ msgstr "non � un directorio maildir."
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non se pode abri-la ruta do directorio maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Comprobando o novo correo"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9354,7 +9553,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9363,7 +9562,7 @@ msgstr ""
 "Non foi posible abrir o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9372,14 +9571,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non � un ficheiro normal."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9388,7 +9587,7 @@ msgstr ""
 "Non foi posible borrar o cartafol `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non est� baleiro. Non borrado."
@@ -9406,13 +9605,13 @@ 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9420,52 +9619,52 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desco�ecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo � caixa de correo temporal: %s: %s"
@@ -9616,50 +9815,50 @@ msgstr "Cancelar"
 msgid "Operation failed: %s"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operaci�n cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Eliminando as mensaxes borradas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Non existe a mensaxe con UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Non � posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaci�n desco�ecida"
@@ -9677,7 +9876,7 @@ msgstr "Deixar as mensaxes no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Borrar despois de %s d�a(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9703,6 +9902,11 @@ msgstr ""
 "trav�s do protocolo APOP. Pode que isto non funcione para t�dolos usuarios, "
 "mesmo nalg�ns servidores que indican que o soportan."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Non foi posible conectarse a %s (porto %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9714,54 +9918,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Non foi posible conectarse � servidor POP en %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Non hai soporte para o mecanismo de autenticaci�n solicitado."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Erro de E/S"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9789,35 +9995,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Non foi posible enviar a mensaxe: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail sa�u co sinal %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Non foi posible executar %s: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail sa�u con estado %d: correo non enviado."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9932,45 +10138,45 @@ msgstr "Fallo temporal de autenticaci�n"
 msgid "Authentication required"
 msgstr "Autenticaci�n requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Non foi posible conectarse � servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "O cartafol parece estar corrompido sen recuperaci�n posible."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "O servidor SMTP %s non soporta o tipo de autenticaci�n %s requirida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9981,90 +10187,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP v�a %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Sa�do SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "A petici�n HELO expirou: %s: non fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Erro na resposta HELO: %s: non fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Erro na resposta RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Autenticaci�n SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticaci�n SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "A petici�n AUTH fallou."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticaci�n do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "A petici�n MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta MAIL FROM: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "A petici�n RCPT TO expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "A petici�n DATA expirou: %s: correo non enviado"
@@ -10072,90 +10278,90 @@ msgstr "A petici�n DATA expirou: %s: correo non enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "O env�o de DATA expirou: remate da mensaxe: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Mala resposta de autenticaci�n do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "A petici�n RSET expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "A petici�n QUIT expirou: %s: non fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "A petici�n AUTH expirou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro � mensaxe"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Non � posible obter o cartafol: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ese non � un ficheiro normal."
@@ -10173,56 +10379,60 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Prema aqu� para o libro de enderezos"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "De:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibir�n unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10230,17 +10440,25 @@ msgstr ""
 "Introduza os enderezos que recibir�n unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Porto:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Non foi posible crear un contexto de sinatura PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10249,34 +10467,34 @@ msgstr ""
 "Erro ao le-lo ficheiro %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�Aviso!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "O ficheiro existe, �sobrescribir?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao gardar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao cargar o ficheiro: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acceder ao ficheiro: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10285,7 +10503,7 @@ msgstr ""
 "Non � posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10294,7 +10512,7 @@ msgstr ""
 "Non foi posible trunca-lo ficheiro: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10303,7 +10521,7 @@ msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10312,7 +10530,7 @@ msgstr ""
 "Evolution atopou ficheiros non gravados dunha sesi�n anterior.\n"
 "�Gostar�alle probar a recuperalos?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10322,50 +10540,46 @@ msgstr ""
 "\n"
 "�Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Inserir Ficheiro"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Gravar sinatura"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (por defecto)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Compo�er unha mensaxe"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10374,9 +10588,9 @@ 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:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10441,8 +10655,8 @@ msgstr "O asunto cont�n"
 msgid "Subject does not contain"
 msgstr "O asunto non cont�n"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10450,12 +10664,11 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "�Sobrescribilo?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Lembrar este contrasinal"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10562,153 +10775,102 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "ano"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "anos"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "segundos"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mes"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuto"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "meses"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hora"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "hora"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mes"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuto"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "meses"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "segundos"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "ano"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "anos"
+
+#: filter/filter-datespec.c:174
 #, fuzzy
 msgid "You have forgotten to choose a date."
 msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-datespec.c:196
-#, fuzzy
-msgid "You have chosen an invalid date."
-msgstr "Oops. Escolleu unha data non v�lida."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"A data da mensaxe hase comparar co momento\n"
-"que sexa cando se execute o filtro ou se\n"
-"abra o cartafolv."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"A data da mensaxe hase comparar co momento\n"
-"que especifique aqu�."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"A data da mensaxe hase comparar cun momento\n"
-"relativo a cando se execute o filtro;\n"
-"\"hai unha semana\" por exemplo."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<prema aqu� para seleccionar unha data>"
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "a hora actual"
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "agora"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "unha hora que especifique"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "unha hora relativa � hora actual"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " atr�s"
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Seleccionar un Fuso Horario"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "agora"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " atr�s"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "atr�s"
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "O %d de %B �s %k:%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<prema aqu� para seleccionar unha data>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regras de Filtrado"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nome do estilo:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "O spool `%s' non existe ou non � un ficheiro normal"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolla unha Acci�n"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Ent�n"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Engadir acci�n"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -10717,12 +10879,12 @@ msgstr ""
 "Oops, esqueceu escoller un cartafol.\n"
 "Volva atr�s e especifique un cartafol v�lido no que deixar o correo."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10731,93 +10893,168 @@ msgstr ""
 "Erro na expresi�n regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Traballando"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "despois"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Proba"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Sen t�tulo"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Executar acci�ns"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "se se cumpren t�dolos criterios"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se se cumpre alg�n criterio"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "sa�nte"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editar CartafolesV"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Entrante"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Sa�nte"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensaxe hase comparar co momento\n"
+"que especifique aqu�."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensaxe hase comparar cun momento\n"
+"relativo a cando se execute o filtro;\n"
+"\"hai unha semana\" por exemplo."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensaxe hase comparar co momento\n"
+"que especifique aqu�."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Cartafoles Virtuais"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "unha hora relativa � hora actual"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "atr�s"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "cartafoles espec�ficos namais"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "a hora actual"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "unha hora que especifique"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Fontes de CartafolV"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "con todos os cartafoles remotos activos"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "con todos os cartafoles locais e cos remotos activos"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "con todos os cartafoles locais"
 
@@ -10845,42 +11082,42 @@ msgid "Beep"
 msgstr "Belice"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Compa��a"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�n"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar � Cartafol"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepci�n"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de env�o"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminada"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "non cont�n"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "non remata en"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "non existe"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "non existe"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "non soa como"
@@ -10902,92 +11139,88 @@ msgid "ends with"
 msgstr "remata en"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresi�n"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Importante"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "foi anterior a"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de Correo"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabeceira da Mensaxe"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover a un Cartafol"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Enviar unha Mensaxe a un Contacto"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Ler"
 
@@ -11003,57 +11236,87 @@ msgstr "Busca por Expresi�n Regular"
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Ocupado"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "� maior que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuaci�n"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Establecer Estado"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Compa��a"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tama�o (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Conta Fonte"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabeceira espec�fica"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "comeza por"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Establecer Estado"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Engadir Regra"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
@@ -11061,12 +11324,12 @@ msgstr "Editar Regra"
 msgid "Score Rules"
 msgstr "Regras de Puntuaci�n"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
@@ -11075,31 +11338,31 @@ msgstr "Oops.  Necesita especificar polo menos un cartafol como fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution est� importando o seu correo de Elm antigo"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s coma %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Correo"
 
@@ -11160,39 +11423,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution est� importando os datos antigos de Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Lixo"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Ficheiro local de correo %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Explorando o directorio"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Comezando a importaci�n"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Opci�ns"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11276,12 +11539,12 @@ msgstr "F�brica para a compo�ente Resumo de Correo."
 msgid "Font Preferences"
 msgstr "Modifica-las preferencias"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
@@ -11330,66 +11593,86 @@ msgstr "Propiedades..."
 msgid "Change this folder's properties"
 msgstr "Modificar as propiedades deste cartafol"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Non definiu ning�n m�todo de env�o de correo"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Mensaxe Remitida"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Compo�er unha mensaxe"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Seguinte Mensaxe"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Anterior Mensaxe"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nova Mensaxe de Correo"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Non se pode inicializar o compo�ente de correo de Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Non se pode rexistrar o armacenamento co shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propiedades de \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propiedades"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
@@ -11439,135 +11722,135 @@ msgstr "%d total"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Responder � Autor"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Responder � _Lista"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "CartafolV pola Lista de Correo"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrar pola Lista de Correo (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "CartafolV pola Lista de Correo (%s)"
@@ -11633,76 +11916,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor de Novas de Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Non pode crear d�as contas co mesmo nome"
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "�Est� seguro de que quere borrar esta conta?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Non borrar"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "�Borrar esta conta de verdade?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desactivar"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "�Est� seguro de que quere borrar esta conta de novas?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Activado"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
@@ -11712,30 +11986,30 @@ msgstr "Porto Rico"
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto � %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11743,7 +12017,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11755,7 +12029,7 @@ msgstr ""
 "recibir ou compo�er correo.\n"
 "�Quere configuralo agora?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11763,7 +12037,7 @@ msgstr ""
 "Ten que configurar unha identidade\n"
 "antes de poder escribir correo."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11772,18 +12046,18 @@ msgstr ""
 "antes de poder compo�elo."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar unha mensaxe"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11791,7 +12065,7 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "�Enviar realmente?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11799,11 +12073,11 @@ msgstr ""
 "Xa que a lista de contactos � que env�a est� configurada para agocha-los "
 "enderezos da lista, esta mensaxe s� ha conter destinatarios Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensaxe s� cont�n destinatarios Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11813,15 +12087,11 @@ msgstr ""
 "cabeceira Apparently-To.\n"
 "�Enviar de todas maneiras?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Ten que configurar unha conta antes de poder enviar este correo."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11829,28 +12099,28 @@ msgstr ""
 "Incapaz de abrir o cartafol de borradores para esta conta.\n"
 "�Gostar�alle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "un remitente desco�ecido"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "O %a, %Y-%m-%d �s %H:%M, %%s escribiu:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�Est� seguro de que quere editar todas as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11858,7 +12128,7 @@ msgstr ""
 "S� pode editar mensaxes gardadas\n"
 "no cartafol de Borradores."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11866,39 +12136,39 @@ msgstr ""
 "S� pode reenviar mensaxes\n"
 "do cartafol de Enviadas."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�Est� seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "�Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Gardar Mensaxes Como..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Amosa-la seguinte mensaxe sen ler"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11910,7 +12180,7 @@ msgstr ""
 "\n"
 "�Eliminar realmente estas mensaxes?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11919,28 +12189,28 @@ msgstr ""
 "Erro ao cargar a informaci�n do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "A impresi�n da mensaxe fallou"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11962,7 +12232,7 @@ msgstr "descrici�n"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
@@ -11983,20 +12253,21 @@ msgid "Add Signature"
 msgstr "Gravar sinatura"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Introduza o seu nome e enderezo de correo embaixo. Os campos \"opcionais\" "
 "de embaixo non precisan que se enchan,\n"
 "a menos que queira inclu�r esta informaci�n no correo que env�e."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Por favor, introduza informacion sobre o seu servidor de correo entrante. Se "
 "non est� seguro, pregunte\n"
@@ -12007,24 +12278,23 @@ msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opci�ns"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Por favor, introduza informaci�n sobre o xeito no que env�a correo. Se non "
 "est� seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Case rematou co proceso de configuraci�n do correo. A identidade, servidor "
 "de correo entrente e m�todo\n"
@@ -12035,43 +12305,20 @@ msgstr ""
 "Este nome s� se emprega para amosalo."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Traballando"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "despois"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Conta"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Comprobando Servicio"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -12340,245 +12587,233 @@ msgstr "Gardar e Pechar"
 msgid "Loading Images"
 msgstr "Cargar _Imaxes"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localizaci�n da caixa do correo"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Servidor NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configuraci�n do Correo"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Fontes de _Novas"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informaci�n Opcional"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaci�n:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opci�ns de Recepci�n"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Informaci�n Requirida"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Opci�ns por defecto"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguridade"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME Seguro"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Seleccionar un binario PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticaci�n"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configuraci�n do Servidor"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atallos"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Fonte"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informaci�n da Fonte"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "mbox est�ndar de Unix"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12588,209 +12823,205 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Este"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 #, 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:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tipo de Autenticaci�n: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Opci�ns por defecto"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Nome Completo:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Cargar imaxes se o autor est� no libro de enderezos"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a mi�a conta por _defecto"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Ruta do binario _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se env�en mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recepci�n de Correo"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conexi�n segura (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Cada"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "descrici�n"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "fiestranovas1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12814,208 +13045,218 @@ msgstr "Non foi posible crear un contexto de sobre S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Non foi posible crear un contexto de descodificaci�n S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Gardar � Disco..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Ver Inline"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver Inline (mediante %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Cargar _Imaxes"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Cargado o contido da mensaxe"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _retrasadas:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "O %d de %B �s %k:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Abrir Ligaz�n no Navegador"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copiar Localizaci�n da Ligaz�n"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Gardar Ligaz�n coma (AM��AME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Gardar Imaxe coma..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Enderezo Incorrecto"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Responder-A"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Cliente de Correo: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Imprimir mensaxe..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Non foi posible crear un contexto de verificaci�n PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensaxe est� asinada dixitalmente e comprobouse a autenticidade."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Esta mensaxe est� asinada dixitalmente pero non se puido comprobar a s�a "
 "autenticidade"
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) v�lido no sitio \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos desco�ecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Non foi posible garda-la metainformaci�n do cartafol, seguramente\n"
 "non poder� abrir este cartafol outra vez: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando o cartafol \"%s\" � formato \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13023,16 +13264,16 @@ msgstr ""
 "Se non pode abrir m�is esta caixa de correo, poida\n"
 "que te�a que reparala a man."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non se pode cambia-lo formato dun cartafol non local."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar %s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13041,7 +13282,7 @@ msgstr ""
 "Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13050,7 +13291,7 @@ msgstr ""
 "Erro ao efectuar a operaci�n:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Traballando"
 
@@ -13058,100 +13299,100 @@ msgstr "Traballando"
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13160,7 +13401,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13169,11 +13410,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13182,27 +13423,22 @@ msgstr ""
 "Non � posible crear ficheiro de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13257,34 +13493,42 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tipo:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Enviar e Recibir correo"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Cancelar"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Actualizando..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operaci�n."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Lembrar este contrasinal"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
@@ -13314,7 +13558,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13344,7 +13588,7 @@ msgstr "Mensaxe remitida - %s"
 msgid "Forwarded message"
 msgstr "Mensaxe remitida"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Mensaxe Remitida"
 
@@ -13358,7 +13602,7 @@ msgstr "Creando o cartafol %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13367,96 +13611,99 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "CartafolesV"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sen asunto)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensaxe"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "M�ltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "M�ltiples Mensaxes"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "A m�is baixa"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "M�is baixa"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "M�is alta"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "A m�is alta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Hoxe �s %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Onte �s %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "O %A �s %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "O %d de %B �s %k:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -13491,47 +13738,47 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tama�o"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Resposta"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Adiante"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informaci�n da Fonte"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Remitir"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Previsualizar"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13555,16 +13802,16 @@ msgstr "Subscrib�ndose ao cartafol \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Desubscrib�ndose do cartafol \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Cartafol"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Non se seleccionou ning�n servidor"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
@@ -18492,11 +18739,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24525,8 +24772,8 @@ msgstr "descrici�n"
 msgid "Mail summary"
 msgstr "Resumo de correo"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
@@ -24544,15 +24791,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Palabra do D�a de Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Citas do D�a"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Engadir fonte de novas"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduza o URL da fonte de novas que desexe engadir"
 
@@ -24565,26 +24812,26 @@ msgstr "<b>Erro descargando o RDF</b>"
 msgid "News Feed"
 msgstr "Fonte de Novas"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Todas"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Enga_dir"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Chuvieira"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Non hai tarefas"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descrici�n:"
@@ -25880,7 +26127,8 @@ msgid "Tasks "
 msgstr "Tarefas "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Configuraci�n do tempo"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25937,7 +26185,7 @@ msgstr "Amosa-los Detalles"
 msgid "Cancel Operation"
 msgstr "Cancelar Operaci�n"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25951,21 +26199,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Borrador"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Entrada"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Sa�da"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Vista"
@@ -26197,22 +26445,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crear un novo cartafol"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"O tipo do cartafol seleccionado non � v�lido para\n"
-"a operaci�n solicitada."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crear un _Novo Cartafol..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sen_t�tulo)"
 
@@ -26234,7 +26475,7 @@ msgstr ""
 "Pode seleccionar \"Autom�tico\" se non o sabe, e Evolution tentar� "
 "averigualo."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -26265,22 +26506,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26289,11 +26526,11 @@ msgstr ""
 "Non hai importador capaz de manexar\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26302,17 +26539,17 @@ msgstr ""
 "Importando %s.\n"
 "Comezando %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao cargar %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26321,32 +26558,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26354,24 +26591,24 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuraci�ns existentes"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
@@ -26417,9 +26654,14 @@ msgstr "Abrindo cartafol %s"
 msgid "in \"%s\" ..."
 msgstr "Abrir en %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Non se pode crear o cartafol indicado:\n"
 "%s"
@@ -26440,8 +26682,8 @@ msgstr ""
 "Non se puido inicia-la interface do Mago de Correo de Evolution\n"
 "%s"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -26484,58 +26726,59 @@ msgstr "Ir � cartafol..."
 msgid "Select the folder that you want to open"
 msgstr "Seleccione o cartafol a abrir"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Crear un novo atallo"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Escolla o cartafol ao que quere que apunte o atallo:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ning�n cartafol visualizado)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Nada)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion est� conectado. Prema neste bot�n para desconectar."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution est� desconect�ndose"
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution est� desconectado. Prema neste bot�n para conectar."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26543,12 +26786,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Non se pode activar o armacenamento local -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26556,31 +26799,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Argumentos non v�lidos"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuraci�ns"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Erro xen�rico"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26589,107 +26832,117 @@ msgstr ""
 "�Realmente desexa eliminar o grupo\n"
 "`%s' da barra de atallos?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Non eliminar"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Renomear Grupo de Atallos"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear o grupo de atallos seleccionado a:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Iconas _Pequenas"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Amosar os atallos como iconas pequenas"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Iconas _Grandes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Amosar os atallos como iconas grandes"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Novo Grupo..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Crear un novo grupo de atallos"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Eliminar este Grupo..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Eliminar este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Re_nomear este Grupo..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atallos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Agochar a Barra de _Atallos"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Agochar a barra de atallos"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Crear un novo atallo"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Crear un novo atallo"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Renomear atallo"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Renomea-lo atallo seleccionado a:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir o cartafol ligado a este atallo"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir nunha Nova _Fiestra"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Renomear este atallo"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Eli_minar"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Eliminar este atallo da barra de atallos"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro ao gardar os atallos."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Atallos"
 
@@ -26697,55 +26950,55 @@ msgstr "Atallos"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Sen erros"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Xa existe un cartafol co mesmo nome"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "O tipo do cartafol indicado non � v�lido"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear o cartafol"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Non se atopou o cartafol indicado"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funci�n non implementada neste medio de armacenamento"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operaci�n non soportada"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non est� soportado neste almacenamento"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "O cartafol especificado non se pode modificar ou eliminar"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Non se pode converter un cartafol nun fillo dun dos seus descendentes"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -26790,74 +27043,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "Erro de E/S"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Argumentos non v�lidos"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "Nada"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "Tarxeta non atopada"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Dete_ctar tipos soportados "
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "O usuario cancelou a operaci�n."
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro erro"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Non v�lido"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Non existe o cartafol %s"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "Ningunha Mensaxe Seleccionada"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26882,6 +27135,26 @@ msgstr "Servidor"
 msgid "The following connections are currently active:"
 msgstr "As seguintes conexi�ns est�n activas nestes intres:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Axenda"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Co_ntactos:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correo"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tarefas"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nome do cartafol:"
@@ -26894,6 +27167,34 @@ msgstr "Tipo do cartafol:"
 msgid "Specify where to create the folder:"
 msgstr "Especifica �nde crear o cartafol:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crear un _Novo Cartafol..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome do cartafol:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Nome do _Servidor:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nome de _Usuario:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26987,16 +27288,16 @@ msgstr "Non preguntar de novo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "_Fiestra de Evolution"
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -27028,7 +27329,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas s�as colaboraci�ns.\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -27037,47 +27338,47 @@ msgstr ""
 "Graci�as\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Non se pode acceder ao shell de Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Non se pode inicializar o shell de Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Desactivar a pantalla inicial"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importaci�n"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a sa�da da depuraci�n de todos os compo�entes a un ficheiro."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compo�entes de Bonobo."
 
@@ -27118,116 +27419,110 @@ msgstr "Copiar a selecci�n"
 msgid "Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Crear un novo contacto"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Crear unha nova lista de contactos"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cortar a selecci�n"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Elimina-los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portarretallos"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Previsualiza os contactos que se han imprimir"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Pre_visualizaci�n da Impresi�n"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Garda-los contactos seleccionados coma unha VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleccionar t�dolos contactos"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar unha mensaxe aos contactos seleccionados."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Enviar mensaxe a un contacto"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Envia-los contactos seleccionados a outra persoa."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "a hora actual"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Acci�ns"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Lista de _Contactos"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Remitir Contacto..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Mover � Cartafol.."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Gardar coma VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Buscar Contactos"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Seleccionar Todo"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar unha _Mensaxe ao Contacto..."
@@ -27272,11 +27567,6 @@ msgstr "Mes"
 msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Pre_visualizaci�n da Impresi�n"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
@@ -27309,7 +27599,7 @@ msgstr "Semana"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Pechar"
 
@@ -27322,7 +27612,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -27334,8 +27624,8 @@ msgstr "Previsualizar o elemento imprimido"
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Gardar"
 
@@ -27360,9 +27650,9 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -27372,7 +27662,7 @@ msgstr "Imprimir So_bre..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Gardar _Como..."
 
@@ -27386,8 +27676,8 @@ msgstr "Enviar unha _Mensaxe ao Contacto..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -27485,26 +27775,36 @@ msgstr ""
 "Eliminar t�dalas mensaxes borradas en t�dolos cartafoles de xeito permanente"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Redactar unha _Nova Mensaxe"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Copiar a mensaxe a un novo cartafol"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Amosar a fiestra de previsualizaci�n da mensaxe"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Subcribirse ou desuscribirse dos cartafoles en servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor de Cartafoles Virtuais..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Panel de Previsualizaci�n"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Subscribirse a Cartafoles..."
 
@@ -27603,7 +27903,7 @@ msgstr "Lista de Mensaxes por F�os"
 msgid "_Expunge"
 msgstr "_Limpar"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Cartafol"
 
@@ -27865,182 +28165,197 @@ msgstr "Anterior Mensaxe Sen Ler"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Resposta � Tarefa"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Comprobar as novas mensaxes en t�dolos cartafoles"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Anterior Mensaxe Importante"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Remiti-lo correo seleccionado a algu�n"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Buscar M_ensaxe..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Gardar a mensaxe coma un ficheiro de texto"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar texto no corpo da mensaxe amosada"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar as opci�ns de p�xina para a impresora actual"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Amosar o C�digo _Fonte da Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Amosa-las _Cabeceiras Completas"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Amosa-la mensaxe no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Amosa-la mensaxe con t�dalas cabeceiras"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Amosa-lo c�digo fonte sen procesar da mensaxe"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "CartafolV pola _Lista de Correo"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "CartafolV polo Au_tor"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "CartafolV polos _Destinatarios"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "CartafolV polo A_sunto"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Copiar � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Remitir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Visualizaci�n das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Mover � Cartafol"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Visualizaci�n _Normal"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Renomear..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Pechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vista"
 
@@ -28069,170 +28384,162 @@ msgstr "Cifrar esta mensaxe co seu Certificado de Cifrado S/MIME"
 msgid "For_mat"
 msgstr "Formato"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Introducir _Ficheiro de Texto..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Inserir un ficheiro como texto dentro da mensaxe"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Inserir ficheiro de texto..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Abrir"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Cifrar con PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Asinar con PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Cifrar con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Sinatura S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gardar Como"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Gardar _Borrador"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Gardar no cartafol..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual cun nome diferente"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Gardar a mensaxe nun cartafol espec�fico"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Enviar m�is _Tarde"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Enviar m�is _tarde"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Enviar a mensaxe en formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Enviar a mensaxe m�is tarde"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Enviar esta mensaxe agora"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Amosar / agochar anexos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Amosar _anexos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Amosar anexos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Asinar esta mensaxe coa s�a clave PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Asinar esta mensaxe co seu Certificado de Sinatura S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Trocar a mostra do campo BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Trocar a mostra do campo CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Trocar a mostra do selector de De"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Trocar a mostra do campo Responder-A"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Campo _Desde"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-A"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Gardar o elemento e pechar a caixa de di�logo"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "A_xuda"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Gravar sinatura"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir o cartafol � lista de cartafoles subscritos"
@@ -28331,176 +28638,206 @@ msgid "Add to _Shortcut Bar"
 msgstr "Engadir � Barra de _Atallos"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Cambiar o nome deste cartafol"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copiar este cartafol"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Crear un _Novo Cartafol..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Crear unha ligaz�n a este cartafol na barra de atallos"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Crear un novo cartafol"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Crear un novo atallo"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Crear un novo cartafol"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Borrar este cartafol"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Amosar un cartafol diferente"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Sa�r"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Fiestra de Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Sa�r do programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Mover este cartafol a outro sitio"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Crear un _Novo Cartafol..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Abrir este cartafol noutra fiestra"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Preferencias de Correo..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configuraci�n do Correo"
+
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Amosar informaci�n sobre Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Trocar"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Trocar a mostra da barra de atallos"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Trocar entre traballo conectado e desconectado"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Ver o cartafol seleccionado"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ de Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Barra de _Cartafoles"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Cartafol"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir � Cartafol..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Novo Cartafol"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "_Preferencias de Correo..."
+msgid "_Preferences..."
+msgstr "Preferencias das Tarefas..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Atallo"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Barra de _Atallos"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Atallo"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimir resumo"
@@ -28514,17 +28851,40 @@ msgid "Reload the view"
 msgstr "Recargar a vista"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Tarxetas de Enderezos"
+#, fuzzy
+msgid "By _Company"
+msgstr "Por Compa��a"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Por Compa��a"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Tarxetas de Enderezos"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista de Tel�fonos"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vista Semanal"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Vista Diaria"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Vista Mensual"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vista de Semana Laboral"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28550,13 +28910,19 @@ msgstr "Por Asunto"
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Coa Categor�a"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28711,11 +29077,11 @@ msgstr "Codificaci�n dos Caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor de Buscas"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Gardar Busca"
 
@@ -28755,21 +29121,21 @@ msgstr "Mensaxe"
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Buscar Agora"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Buscar Agora"
 
@@ -28783,19 +29149,135 @@ msgstr "O Servidor Persoal de Libro de Enderezos"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "O Servidor Persoal de Axenda; f�brica de axendas"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): non foi posible inicializar GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): non foi posible inicializar GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Mover..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Mudou o estado da xuntanza. �Enviar unha versi�n actualizada?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Borrar esta Cita"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Expendedor: %s\n"
+#~ "Asunto: %s"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Erro de E/S"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Erro na resposta de benvida: %s: posiblemente non fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "A petici�n HELO expirou: %s: non fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Erro na resposta HELO: %s: non fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "A petici�n QUIT expirou: %s: non fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Inserir Ficheiro"
+
+#, fuzzy
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Oops. Escolleu unha data non v�lida."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "A data da mensaxe hase comparar co momento\n"
+#~ "que sexa cando se execute o filtro ou se\n"
+#~ "abra o cartafolv."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor de Novas de Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "�Est� seguro de que quere borrar esta conta de novas?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Ten que configurar unha conta antes de poder enviar este correo."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Servidor NNTP:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Fontes de _Novas"
+
+#~ msgid "Source"
+#~ msgstr "Fonte"
+
+#~ msgid "Source Information"
+#~ msgstr "Informaci�n da Fonte"
+
+#~ msgid "newswindow1"
+#~ msgstr "fiestranovas1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Gardar � Disco..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Imprimir mensaxe..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Crear un novo cartafol"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "O tipo do cartafol seleccionado non � v�lido para\n"
+#~ "a operaci�n solicitada."
+
+#~ msgid "_Contact List"
+#~ msgstr "Lista de _Contactos"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Introducir _Ficheiro de Texto..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Inserir un ficheiro como texto dentro da mensaxe"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Inserir ficheiro de texto..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Enviar m�is _Tarde"
+
+#~ msgid "Send _later"
+#~ msgstr "Enviar m�is _tarde"
+
+#~ msgid "Send the message later"
+#~ msgstr "Enviar a mensaxe m�is tarde"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Preferencias de Correo..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Fontes do Libro de Enderezos"
 
@@ -28928,10 +29410,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgstr "Tuvalu"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Ficheiro de sinatura:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Borrar todo ag�s a sinatura"
 
@@ -29297,12 +29775,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Rep�blica de Moldavia"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crear unha nova cita"
-
-#~ msgid "Create a new task"
-#~ msgstr "Crear unha nova tarefa"
-
 #~ msgid "New _Task"
 #~ msgstr "Nova T_arefa"
 
@@ -29391,9 +29863,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ "Isto conectarase � servidor POP e usar� Kerberos 4 para autenticarse con "
 #~ "el."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Non foi posible autenticarse co servidor KPOP: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Non foi posible conectarse � servidor: %s."
 
@@ -29433,10 +29902,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Cartafol de armacenamento de correo (interno)"
 
-#, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Non foi posible conectarse � servidor: %s."
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Nova _Mensaxe"
 
@@ -29481,9 +29946,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizaci�n:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Lembrar este contrasinal"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Enviar as mensaxes en formato HTML por defecto."
 
@@ -30518,9 +30980,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Aplicar calquera filtro novo ao correo desta caixa"
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Copiar a mensaxe a un novo cartafol"
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "Amosar todas as cabeceiras da mensaxe"
 
@@ -30636,9 +31095,6 @@ msgstr "init_bonobo(): non foi posible inicializar Bonobo"
 #~ msgid "Save task as something else"
 #~ msgstr "Gardar a tarefa como outra cousa distinta"
 
-#~ msgid "Tasks Preferences..."
-#~ msgstr "Preferencias das Tarefas..."
-
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Personali_zar Barras de Tarefas..."
 
diff --git a/po/hu.po b/po/hu.po
index ebf587e194..4a8ae5a072 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.2\n"
-"POT-Creation-Date: 2002-07-19 09:52+0200\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-19 10:08+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializ�l�sa nem siker�lt"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Keres�s..."
 
@@ -356,31 +356,31 @@ msgstr "Bet�lt�s..."
 msgid "Error in search expression."
 msgstr "Hiba a keres�si kifejez�sben."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "N�vjegy hozz�ad�sa az LDAP-kiszolg�l�hoz..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "N�vjegy elt�vol�t�sa az LDAP-kiszolg�l�r�l..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "N�vjegy m�dos�t�sa az LDAP-kiszolg�l�n..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Keres�s �jraind�t�sa."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP keres�s eredm�nyeinek let�lt�se..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Hiba a keres�s k�zben"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Nem siker�lt �rtelmezni a lek�rdez�st"
 
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1073
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "N�vjegyek"
 
@@ -493,31 +493,30 @@ msgstr "LDAP-kiszolg�l�"
 msgid "LDAP server containing contact information"
 msgstr "N�vjegyeket tartalmaz� LDAP-kiszolg�l�"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "�j c�mlista"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "_C�mlista"
-
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Create a new contact list"
-msgstr "�j c�mlista k�sz�t�se"
-
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "�j n�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:584
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_N�vjegy"
 
-#: addressbook/gui/component/addressbook-component.c:585
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "�j n�vjegy k�sz�t�se"
 
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "�j c�mlista"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "_C�mlista"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "�j c�mlista k�sz�t�se"
+
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
 msgstr "Nem siker�lt kapcsolatba l�pni az LDAP-kiszolg�l�val."
@@ -560,11 +559,11 @@ msgstr "A gnome-vfs inicializ�l�sa nem siker�lt"
 msgid "Other Contacts"
 msgstr "Egy�b c�mt�rak"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nem siker�lt megnyitni a c�mjegyz�ket"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -574,7 +573,7 @@ msgstr ""
 "jelenti, hogy helytelen URI-t adt�l meg, vagy az LDAP\n"
 "kiszolg�l� nem m�k�dik."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -586,7 +585,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -594,42 +593,42 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�rd be %s jelszav�t (%s felhaszn�l�)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "N�v kezd�dik"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "Email ="
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kateg�ria"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "B�rmely mez� tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Halad�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "B�rmelyik kateg�ria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappab�ng�sz� meg fog nyitni"
 
@@ -747,7 +746,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "C�mjegyz�k forr�sai"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Mindig"
@@ -839,7 +838,7 @@ msgstr "Be�ll�t�sok"
 msgid "Mappings"
 msgstr "Marg�k"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
 #: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Soha"
@@ -890,7 +889,7 @@ msgstr "Keres�s _hat�k�re: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1972 calendar/gui/e-day-view.c:1703
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
 #: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Keres�s"
@@ -1077,15 +1076,15 @@ msgid "Using email address"
 msgstr "E-mail c�m haszn�lata"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Amikor csak lehets�ges"
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:136 shell/glade/e-folder-list.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Hozz�_ad�s"
 
@@ -1125,11 +1124,11 @@ msgstr "Ne haszn�lja az SSL/TLS-t"
 msgid "_Download limit:"
 msgstr "_Let�lt�si korl�t:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:151 ui/evolution-addressbook.xml.h:37
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:41
 #: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
@@ -1233,9 +1232,9 @@ msgstr "Factory a c�mjegyz�k n�vkiv�laszt� fel�let�hez"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:692
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:462
-#: filter/filter-rule.c:677 my-evolution/e-summary-shown.c:552
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "T�rl�s"
@@ -1265,11 +1264,11 @@ msgstr "(%d nincs megjelen�tve)"
 msgid "Unnamed Contact"
 msgstr "N�vtelen n�vjegy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:510
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "N�vjegyek kijel�l�se a c�mjegyz�kb�l"
 
-#: addressbook/gui/component/select-names/e-select-names.c:547
+#: addressbook/gui/component/select-names/e-select-names.c:544
 msgid "Find contact in"
 msgstr "N�vjegy keres�se"
 
@@ -1401,11 +1400,11 @@ msgstr "Tud fogadni _HTML levelet"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3626
-#: calendar/gui/e-week-view.c:3510 filter/filter.glade.h:8
-#: mail/folder-browser.c:1716 mail/mail-config.glade.h:149
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:95
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_T�rl�s"
@@ -2640,7 +2639,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_C�mek elrejt�se, amikor erre a list�ra k�ldesz levelet"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_T�rl�s"
 
@@ -2703,7 +2702,7 @@ msgstr ""
 "c�mjegyz�kben. Mindenk�ppen hozz�adod?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Halad� keres�s"
 
@@ -2731,13 +2730,13 @@ msgid "Error getting book view"
 msgstr "Hiba %s ind�t�sakor"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Hiba a k�rtya m�dos�t�sakor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Siker�lt"
 
@@ -2745,7 +2744,7 @@ msgstr "Siker�lt"
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
 #: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1123
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -2754,7 +2753,7 @@ msgid "Repository offline"
 msgstr "Kapcsolat n�lk�li t�rol�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Jogosults�gi hiba"
 
@@ -2771,7 +2770,7 @@ msgid "Protocol not supported"
 msgstr "A protokoll nem t�mogatott"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2792,48 +2791,53 @@ msgid "TLS not Available"
 msgstr "TLS nem el�rhet�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "`%s' f�jl nem l�tezik."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Egy�b hiba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Mented a v�ltoztat�sokat?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Hiba a lista hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Hiba a k�rtya hozz�ad�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Hiba a lista m�dos�t�sakor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Hiba a lista t�rl�sekor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Hiba a k�rtya t�rl�sekor"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Megjelen�t�s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Megjelen�t�s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2841,21 +2845,21 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "0 k�rtya"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "0 k�rtya"
@@ -2928,7 +2932,7 @@ msgstr "C�mjegyz�k"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Ment�s VCard-k�nt"
 
@@ -2961,7 +2965,7 @@ msgid "Pilot Settings..."
 msgstr "Pilot be�ll�t�sai..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "N�vjegy tov�bb�t�sa"
 
@@ -2970,8 +2974,8 @@ msgid "Send Message to Contact"
 msgstr "Lev�l k�ld�se ennek a szem�lynek"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Nyomtat�s"
@@ -2989,7 +2993,7 @@ msgid "Move to folder..."
 msgstr "�thelyez�s mapp�ba..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kiv�g�s"
 
@@ -3000,20 +3004,20 @@ msgid "Copy"
 msgstr "M�sol�s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Beilleszt�s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "T�rl�s"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr "Aktu�lis n�zet"
 
@@ -3275,26 +3279,26 @@ msgstr "N�vtelen tal�lkoz�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:734
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Magas"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1699
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:733
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Norm�lis"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Alacsony"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nem megadott"
@@ -3413,11 +3417,11 @@ msgstr "Szundi id� (percek)"
 msgid "_Edit appointment"
 msgstr "_Tal�lkoz� szerkeszt�se"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:674
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Nincs le�r�s."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:734
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3429,13 +3433,13 @@ 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:752
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2611
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Figyelmeztet�s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:757
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3452,7 +3456,7 @@ msgstr ""
 "\n"
 "Biztos futtatni akarod ezt a programot?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Ne k�rdezze meg t�bbet."
@@ -3481,7 +3485,7 @@ msgstr "Le�r�s tartalmazza"
 msgid "Comment contains"
 msgstr "Megjegyz�s tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1090
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Ki nem v�logatott"
 
@@ -3492,7 +3496,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1429 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d, %a"
 
@@ -3514,19 +3518,19 @@ msgstr "%Y %B %d"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nem siker�lt l�trehozni a napt�rn�zetet. Ellen�rizd az ORBit �s OAF "
 "telep�t�sedet."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:976
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Szem�lyes"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:978
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Bizalmas"
@@ -3551,37 +3555,37 @@ msgstr "K"
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1135
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Szabad"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Foglalt"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1179
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nem indult m�g el"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "K�sz"
 
-#: calendar/gui/calendar-model.c:1040
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3592,34 +3596,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1177 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1913
-#: mail/folder-browser.c:1678 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:453
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
 #: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Semmi"
 
-#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Ism�tl�d�"
 
-#: calendar/gui/calendar-model.c:1703
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Kiosztva"
 
-#: calendar/gui/calendar-model.c:1709 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Igen"
 
-#: calendar/gui/calendar-model.c:1709 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nem"
 
@@ -3641,7 +3644,7 @@ msgstr "H�napn�zet"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1065
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Napt�r"
 
@@ -3649,12 +3652,12 @@ msgstr "Napt�r"
 msgid "Folder containing appointments and events"
 msgstr "Tal�lkoz�kat �s esem�nyeket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1069
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Feladatok"
 
@@ -3662,56 +3665,56 @@ msgstr "Feladatok"
 msgid "Folder containing to-do items"
 msgstr "Teend�ket tartalmaz� mappa"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "�j tal�lkoz�"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Tal�lkoz�"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "�j tal�lkoz� l�trehoz�sa"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "�j �rtekezlet"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "�_rtekezlet"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "�j feladat"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "�j feladat l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "�j eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "_Eg�sz napos tal�lkoz�"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "�j tal�lkoz� l�trehoz�sa"
 
-#: calendar/gui/component-factory.c:721
-msgid "New appointment"
-msgstr "�j tal�lkoz�"
-
-#: calendar/gui/component-factory.c:721
-msgid "_Appointment"
-msgstr "_Tal�lkoz�"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "�j tal�lkoz� l�trehoz�sa"
-
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3778,7 +3781,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Ezekkel az argumentumokkal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "naponk�nt"
 
@@ -3786,11 +3790,13 @@ msgstr "naponk�nt"
 msgid "extra times every"
 msgstr "-szer minden"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "�r�nk�nt"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "percenk�nt"
 
@@ -3918,7 +3924,7 @@ msgstr "Eml�keztet�k"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�sszefoglal�:"
 
@@ -3947,7 +3953,7 @@ msgstr "tal�lkoz� v�ge"
 msgid "hour(s)"
 msgstr "�ra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "perc"
 
@@ -4123,7 +4129,7 @@ msgid "_Fri"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Alap"
 
@@ -4297,20 +4303,20 @@ msgstr "Napl� bejegyz�s - %s"
 msgid "No summary"
 msgstr "Nincs �sszegz�s"
 
-#: calendar/gui/dialogs/comp-editor.c:1204
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3839
-#: calendar/gui/e-week-view.c:3742 composer/e-msg-composer.c:1026
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Ment�s m�sk�nt..."
 
-#: calendar/gui/dialogs/comp-editor.c:1305
-#: calendar/gui/dialogs/comp-editor.c:1329
-#: calendar/gui/dialogs/comp-editor.c:1353
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nem siker�lt megszerezni a legfrissebb v�ltozatot!"
 
@@ -4509,7 +4515,7 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4521,7 +4527,7 @@ msgstr "Szerep"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "�llapot"
@@ -4604,7 +4610,7 @@ msgstr "ekkor:"
 msgid "first"
 msgstr "els�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:87
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "m�sodperc"
 
@@ -4624,7 +4630,7 @@ msgstr "utols�"
 msgid "Other Date"
 msgstr "Egy�b d�tum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "nap"
 
@@ -4722,20 +4728,26 @@ msgstr "% k�sz"
 msgid "Date Completed:"
 msgstr "Teljes�t�s d�tuma:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Beavatkoz�s sz�ks�ges"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Folyamatban"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Priorit�s:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "�ll_apot:"
 
@@ -4749,7 +4761,7 @@ msgstr "Egyszer�"
 msgid "Assignment"
 msgstr "Kioszt�s"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4764,119 +4776,130 @@ msgid "_Due Date:"
 msgstr "Le_j�rat:"
 
 #: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2752
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
 #: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Kijel�lt objektumok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3608
-#: calendar/gui/e-week-view.c:3492 mail/folder-browser.c:1689
-#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Megnyit�s"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Ment�s m�sk�nt..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3610
-#: calendar/gui/e-week-view.c:3466 calendar/gui/e-week-view.c:3494
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Nyomtat�s..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3615
-#: calendar/gui/e-week-view.c:3499 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_iv�g�s"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3616
-#: calendar/gui/e-week-view.c:3500 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_M�sol�s"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3579
-#: calendar/gui/e-day-view.c:3617 calendar/gui/e-week-view.c:3470
-#: calendar/gui/e-week-view.c:3501 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Beilleszt�s"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "_Feladat kioszt�sa"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "_Tov�bb�t�s iCalendark�nt"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Megjel�l�s k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Kijel�lt feladatok megjel�l�se k�szk�nt"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Kijel�lt feladatok t�rl�se"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7467
-#: calendar/gui/e-week-view.c:4231
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Objektumok friss�t�se"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
@@ -4885,8 +4908,8 @@ msgstr "Kattints ide �j feladat hozz�ad�s�hoz"
 msgid "Alarms"
 msgstr "�breszt�k"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "K�sz"
 
@@ -4916,7 +4939,7 @@ msgstr "Kezd�s d�tuma"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:51 shell/e-shell.c:740
-#: shell/e-shortcuts.c:1057
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "�sszefoglal�"
 
@@ -4958,104 +4981,104 @@ 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:284 calendar/gui/e-day-view.c:1415
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1442
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:639 calendar/gui/e-week-view.c:376
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "de"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:642 calendar/gui/e-week-view.c:379
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "du"
 
-#: calendar/gui/e-day-view.c:3563
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "�j _tal�lkoz�"
 
-#: calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "�_j eg�sz napos esem�ny"
 
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "�j �rtekezlet"
 
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "�j feladat"
 
-#: calendar/gui/e-day-view.c:3574 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Nyomtat�s..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3476
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ugr�s a _mai napra"
 
-#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3477
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ugr�s d�tumra..."
 
-#: calendar/gui/e-day-view.c:3593 calendar/gui/e-week-view.c:3481
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci� _k�zz�t�tele"
 
-#: calendar/gui/e-day-view.c:3598 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Be�ll�t�sok..."
 
-#: calendar/gui/e-day-view.c:3600 calendar/gui/e-week-view.c:3486
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "_Pilot be�ll�t�sai..."
 
-#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3493
-#: mail/folder-browser.c:1691 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "M_ent�s m�sk�nt..."
 
-#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3505
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "�rtekezlet _tervez�se..."
 
-#: calendar/gui/e-day-view.c:3622 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "_Tov�bb�t�s iCalendark�nt..."
 
-#: calendar/gui/e-day-view.c:3627 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Az el�fordul�s _mozgathat�v� t�tele"
 
-#: calendar/gui/e-day-view.c:3628 calendar/gui/e-week-view.c:3512
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Az _el�fordul�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3629 calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Az �_sszes el�fordul�s t�rl�se"
 
-#: calendar/gui/e-day-view.c:3991 calendar/gui/e-week-view.c:3870
-#: shell/e-shell-view-menu.c:641
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "�gy t�nik, hogy nincsenek telep�tve a rendszerre GNOME Pilot eszk�z�k."
 
-#: calendar/gui/e-day-view.c:3997 calendar/gui/e-week-view.c:3876
-#: shell/e-shell-view-menu.c:649
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Hiba a %s v�grehajt�sa k�zben."
@@ -5096,7 +5119,7 @@ msgstr "A feladat befejezve: <b> "
 msgid "Task Due: <b>"
 msgstr "A feladat hat�rideje: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar inform�ci�"
 
@@ -5105,332 +5128,337 @@ msgstr "iCalendar inform�ci�"
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Ismeretlen szem�ly"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Olvasd el a k�vetkez�ket, �s v�lassz ki egy m�veletet az al�bbi men�b�l."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Hely:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "�llapot:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Elutas�tva"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "V�lassz egy m�veletet:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Friss�t�s"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
 #: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "K�s�rletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Elutas�tva"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "V�laszol� �llapot�nak friss�t�se"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Legut�bbi inform�ci� k�ld�se"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "M�gse"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> inform�ci�t tett k�zz� az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Inform�ci� az �rtekezletr�l"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> arra k�r, hogy vegy�l r�szt az �rtekezleten."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Javaslat �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� �rtekezlethez."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "�rtekezlet friss�t�se"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat az �rtekezletr�l."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "�rtekezletfriss�t�si k�r�s"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> v�laszolt egy �rtekezlet-�sszeh�v�si k�r�sre."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "V�lasz az �rtekezletre"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az �rtekezletet."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "�rtekezlet lemond�sa"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> egy �rtelmetlen levelet k�ld�tt."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Rossz �rtekezletfelh�v�s"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> feladatinform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> arra k�r, hogy hajts v�gre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> szeretne hozz�tenni egy l�tez� feladathoz."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Feladat friss�t�se"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> szeretn� megkapni a leg�jabb adatokat a feladatr�l."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Feladatfriss�t�si felh�v�s"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> v�laszolt egy feladatfelk�r�sre."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "V�lasz feladatra"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> t�r�lte a feladatot."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Feladat lemond�sa"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Rossz feladat�zenet"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> szabad/foglalt inform�ci�t tett k�zz�."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> k�ri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt k�r�s"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> v�laszolt egy szabad/foglalt k�r�sre."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt v�lasz"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt �zenet"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "A lev�l �gy t�nik, nem megfelel�en form�zott"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "A lev�l csak nem t�mogatott k�r�seket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "A mell�klet nem tartalmaz �rv�nyes napt�r�zenetet"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "A mell�klet nem tartalmaz megn�zhet� napt�relemet"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Az objektum �rv�nytelen �s nem lehet friss�teni\n"
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA hiba t�rt�nt\n"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr "Az elem nem tal�lhat�\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr "Nincs jogosults�god a napt�r friss�t�s�hez\n"
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Friss�t�s k�sz\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "A napt�rf�jlt nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az elem nem l�tezik t�bb�"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "A v�lasz oylant�l �rkezett, aki nem r�sztvev�. Hozz�adod a r�sztvev�kh�z?"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "A r�sztvev� �llapot�t nem lehetett friss�teni, mert az �llapot �rv�nytelen!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "A r�sztvev� �llapota friss�tve\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "A r�sztvev� �llapot�t nem lehetett friss�teni!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "T�rl�s befejezve"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Elk�ldve!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elk�ldeni!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr "V�lassz napt�rmapp�t"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr "V�lassz feladatmapp�t"
 
@@ -5475,7 +5503,7 @@ msgstr "date-start"
 msgid "Chair Persons"
 msgstr "Eln�k"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Sz�ks�ges r�sztvev�k"
 
@@ -5488,57 +5516,52 @@ msgid "Non-Participants"
 msgstr "Nem vesz r�szt"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Egy�n"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Csoport"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Er�forr�s"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Szoba"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Levezet�"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Sz�ks�ges r�sztvev�k"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Esetleges r�sztvev�"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Nem vesz r�szt"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Beavatkoz�s sz�ks�ges"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "K�s�rleti"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Deleg�lt"
 
@@ -5628,39 +5651,40 @@ msgstr "Megbesz�l�s _kezd�dik:"
 msgid "Meeting _end time:"
 msgstr "Megbesz�l�s _v�ge:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyit�sa %s-kor"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nem siker�lt bet�lteni a feladatot %s-be."
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' bet�lt�s�hez sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr "Feladatok befejez�se..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr "Kijel�lt objektumok t�rl�se..."
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Tiszt�t�s"
 
-#: calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "�j _tal�lkoz�..."
 
@@ -5674,11 +5698,16 @@ msgstr "Nem siker�lt megnyitni a mapp�t '%s'-ben"
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' megnyit�s�hoz sz�ks�ges elj�r�s nem t�mogatott"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Napt�r megnyit�sa %s-kor"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s mappa megnyit�sa"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "�prilis"
@@ -5735,47 +5764,47 @@ msgstr "okt�ber"
 msgid "September"
 msgstr "szeptember"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Legal�bb egy r�sztvev� sz�ks�ges"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "A szervez�t be kell �ll�tani."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Esem�nyinform�ci�"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Feladatinform�ci�"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Napl�inform�ci�"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Szabad/foglalt inform�ci�"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Napt�rinform�ci�"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Friss�tve"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Friss�t�s"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Ellenjavaslat"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "R�szt kell venned az esem�nyen."
 
@@ -6010,7 +6039,7 @@ msgid "Print Calendar"
 msgstr "Napt�r nyomtat�sa"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2899
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
@@ -6041,12 +6070,13 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ez a m�velet v�glegesen t�rli a t�r�ltk�nt megjel�lt feladatokat. Ha folytatod, akkor ezek a feladatok �r�kre elvesznek.\n"
+"Ez a m�velet v�glegesen t�rli a t�r�ltk�nt megjel�lt feladatokat. Ha "
+"folytatod, akkor ezek a feladatok �r�kre elvesznek.\n"
 "\n"
 "T�nyleg t�rl�d ezeket a feladatok?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2383
-#: mail/mail-callbacks.c:2625
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ne k�rdezze meg t�bbet."
 
@@ -6144,81 +6174,81 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "a time-now 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "a make-time 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "a make-time els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "a make-time els� argumentum�nak ISO 8601 d�tum/id� karakterl�ncnak kell "
 "lennie"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "a time-add-day 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "a time-day-add els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "a time-add-day m�sodik argumentumak�nt eg�sz sz�mot v�r"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "a time-day-begin 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "a time-day-begin els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "a time-day-end 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "a time-day-end els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "a get-vtype 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "az occur-in-time-range? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "az occur-in-time-range? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "az occur-in-time-range? m�sodik argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "a contains? 2 argumentumot v�r"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "a contains? els� argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "a contains? m�sodik argumentumak�nt karakterl�ncot v�r"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6226,11 +6256,11 @@ msgstr ""
 "a contains? els� argumentumak�nt a k�vetkez�k egyik�t v�rja: \"any\", "
 "\"summary\", \"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "a has-categories? legal�bb egy argumentumot v�r"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6238,19 +6268,19 @@ msgstr ""
 "a has-categories? minden argumentumak�nt karakterl�ncot v�r, vagy csak "
 "egyetlen logikai hamis (#f) �rt�ket"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "az is-completed? 0 argumentumot v�r"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "a completed-before? 1 argumentumot v�r"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "a completed-before? els� argumentumak�nt time_t-t v�r"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "A keres�si kifejez�s ki�rt�kel�se nem logikai �rt�kre vezetett"
 
@@ -7846,52 +7876,52 @@ msgstr "%s mappa t�rol�sa"
 msgid "You must be working online to complete this operation"
 msgstr "A m�velet befejez�s�hez h�l�zati kapcsolattal kell rendelkezned"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Mapp�k szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a sz�r� feldolgoz�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Hiba a sz�r� v�grehajt�sa k�zben: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Nem siker�lt megnyitni spool mapp�t"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nem siker�lt feldolgozni a spool mapp�t"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. lev�l let�lt�se (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d. lev�l rossz"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Mappa szinkroniz�l�sa"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek let�lt�se: %d/%d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
@@ -7911,7 +7941,7 @@ msgstr "�rv�nytelen argumentumok"
 msgid "Invalid arguments to (user-tag)"
 msgstr "�rv�nytelen argumentumok"
 
-#: camel/camel-filter-search.c:508
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nem siker�lt gyorst�razni %s �zenetet: %s"
@@ -8288,7 +8318,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
@@ -8465,34 +8495,134 @@ 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-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Tan�s�tv�nyok ellen�rz�se sikertelen."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Kibocs�t�: %s\n"
-"T�ma: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Tan�s�tv�nyok ellen�rz�se sikertelen."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Rossz tan�s�tv�ny %s-t�l:\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Elfogadod m�gis?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Nem siker�lt menteni az al��r�sf�jlt."
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Hiba %s bet�lt�sekor"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Nincs bent"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Tan�s�tv�nyok ellen�rz�se sikertelen."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "�rv�nytelen argumentum"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Tan�s�tv�nyazonos�t�:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8505,16 +8635,34 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Al��r�s:           %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "BAD"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Rossz tan�s�tv�ny %s-t�l:\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Elfogadod m�gis?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8535,17 +8683,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nem siker�lt �rtelmezni ezt az URL-t: `%s'"
 
-#: camel/camel-vee-folder.c:616
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Hiba %s ind�t�sakor"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nincs %s lev�l %s-ben"
 
-#: camel/camel-vee-folder.c:801 camel/camel-vee-folder.c:807
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "�j levelek keres�se az �sszes mapp�ban"
@@ -8573,12 +8721,12 @@ msgstr "Nem siker�lt �tnevezni a mapp�t: %s: Nincs ilyen mappa"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2281
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "M�velet megszak�tva"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2284
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolg�l� v�ratlanul sz�tkapcsolt: %s"
@@ -8607,40 +8755,40 @@ msgstr "Az IMAP kiszolg�l� v�lasza nem tartalmaz %s inform�ci�t"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "V�ratlan OK v�lasz az IMAP kiszolg�l�t�l: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nem siker�lt l�trehozni %s k�nyvt�rat: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:235
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nem siker�lt bet�lteni %s �sszefoglal�j�t"
 
-#: camel/providers/imap/camel-imap-folder.c:301
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "A mappa megsemmis�lt �s �jra l�tre lett hozva a kiszolg�l�n"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:526
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Megv�ltozott levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:1857
-#: camel/providers/imap/camel-imap-folder.c:2351
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Ez a lev�l jelenleg nem el�rhet�"
 
-#: camel/providers/imap/camel-imap-folder.c:2014
-#: camel/providers/imap/camel-imap-folder.c:2091
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "�sszefoglal� adatok let�lt�se az �j levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2020
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/imap/camel-imap-folder.c:2388
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nem tal�lhat� a lev�lt�rzs a FETCH v�laszban."
 
@@ -8705,70 +8853,75 @@ msgstr ""
 "Ez a be�ll�t�s sima sz�veges jelsz�val l�tes�t kapcsolatot az IMAP "
 "kiszolg�l�val."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP-kiszolg�l�"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s %s szolg�ltat�s %s-n"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Kapcsolat megszak�tva"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nem siker�lt csatlakozni %s %d portj�hoz: %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS kiterjeszt�s nem t�mogatott"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL-t�rgyal�s sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "A mappa nem �res."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, 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:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Nem adt�l meg jelsz�t."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8779,31 +8932,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1393
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1661
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "A mappan�v nem tartalmazhatja a Return karaktert."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A sz�l�mappa nem tartalmazhat almapp�kat"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nem siker�lt megnyitni a postal�d�t: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -8861,7 +9020,7 @@ msgid ""
 msgstr "A helyi levelek olvas�sa �s t�rol�sa szabv�nyos mbox spool f�jlokban"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8872,38 +9031,38 @@ msgstr "%s t�rol�gy�k�r nem abszol�t �tvonal"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, 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:185
+#: camel/providers/local/camel-local-store.c:186
 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:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi lev�l f�jl"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nem siker�lt '%s' mappaindexf�jlt t�r�lni: %s"
@@ -8963,7 +9122,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9001,26 +9160,26 @@ msgstr "nem maildir k�nyvt�r"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem siker�lt p�szt�zni ezt a mapp�t: `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nem siker�lt megnyitni a maildir k�nyvt�r el�r�si �tj�t: %s: %s "
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "�j levelek keres�se"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Mappa t�rol�sa"
@@ -9064,7 +9223,7 @@ msgstr "A mappa jav�thatatlanul rossznak n�z ki."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Lev�l�r�s sikertelen: rossz postafi�k?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9073,7 +9232,7 @@ msgstr ""
 "Nem siker�lt megnyitni '%s' f�jlt:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9082,14 +9241,14 @@ msgstr ""
 "Nem siker�lt l�trehozni `%s' f�jlt:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, 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:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9098,7 +9257,7 @@ msgstr ""
 "Nem siker�lt t�r�lni `%s' mapp�t:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem �res. Nem t�r�lhet�."
@@ -9113,64 +9272,64 @@ msgstr "Nem siker�lt megnyitni a mapp�t: %s: %s"
 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 %s mapp�ban"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, 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:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, 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:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Sikertelen �r�si m�velet az ideiglenes postafi�kba: %s: %s"
@@ -9318,47 +9477,47 @@ msgstr "Felhaszn�l� megszak�totta"
 msgid "Operation failed: %s"
 msgstr "M�velet sikertelen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP �sszefoglal� let�lt�se"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Felhaszn�l� megszak�totta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nem siker�lt let�lteni a POP-�sszefoglal�t: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "A t�rl�sre kijel�lt levelek elt�vol�t�sa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonos�t�j� lev�l"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP lev�l let�lt�se"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nem siker�lt bet�lteni a levelet: %s:  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
@@ -9467,7 +9626,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9492,35 +9651,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nem siker�lt forkolni a sendmailt: %s: a lev�l nem ment el"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nem siker�lt elk�ldeni a levelet: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "A sendmail %s szign�llal kil�pett, a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nem siker�lt v�grehajtani %s-t, a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "A sendmail %d �llapottal l�pett ki: a lev�l nem ment el."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9630,45 +9789,45 @@ msgstr "Ideiglenes hiteles�t�si hiba"
 msgid "Authentication required"
 msgstr "Hiteles�t�s sz�ks�ges"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "�dv�zl� v�lasz hiba: %s: tal�n nem v�gzetes"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nem siker�lt kapcsol�dni a POP kiszolg�l�hoz.\n"
 "Hiba a felhaszn�l�n�v k�ld�se k�zben: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "A lev�l �gy t�nik, nem megfelel�en form�zott"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP kiszolg�l� nem t�mogatja a k�rt %s hiteles�t�si t�pust"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAdd meg %s@%s SMTP jelszav�t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9679,90 +9838,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:643
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP kiszolg�l�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP lev�lk�ld�s %s kiszolg�l�n �t"
 
-#: camel/providers/smtp/camel-smtp-transport.c:663
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:668 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Lev�l k�ld�se"
 
-#: camel/providers/smtp/camel-smtp-transport.c:679
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nem lehet elk�ldeni a levelet: nincs c�mzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:839
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP �dv�zlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:870
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Id�t�ll�p�s a HELO k�r�sn�l: %s: nem v�gzetes"
+#: camel/providers/smtp/camel-smtp-transport.c:892
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:890
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO v�lasz hiba: %s: nem v�gzetes"
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:955
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP hiteles�t�s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:961
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hiteles�t�si objektum l�trehoz�sakor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:978
-#: camel/providers/smtp/camel-smtp-transport.c:990
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:999
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH k�r�s sikertelen."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a MAIL FROM k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1099
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Hib�s MAIL FROM v�lasz: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s az RCPT TO k�r�sn�l: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1139
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1181
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
@@ -9770,90 +9929,90 @@ msgstr "Id�t�ll�p�s a DATA k�r�sn�l: %s: a lev�l nem ment el"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1195
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Hib�s DATA v�lasz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1235
-#: camel/providers/smtp/camel-smtp-transport.c:1253
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Id�t�ll�p�s a DATA k�ld�s�n�l: a lev�l v�get �rt: %s: a lev�l nem ment el"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1267
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Rossz hiteles�t�si v�lasz a kiszolg�l�t�l"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1290
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Id�t�ll�p�s az RSET k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1304
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1327
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Id�t�ll�p�s a QUIT k�r�sn�l: %s: nem v�gzetes"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Id�t�ll�p�s az AUTH k�r�sn�l: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1341
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Hib�s RSET v�lasz: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u b�jt"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "mell�klet"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "T�rli a kiv�lasztott elemeket a mell�kletlist�r�l"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Csatol�s..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "F�jl csatol�sa a lev�lhez"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nem siker�lt csatolni a f�jlt: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nem siker�lt csatolni a f�jlt: %s: nem k�z�ns�ges f�jl"
@@ -9871,11 +10030,11 @@ msgid "MIME type:"
 msgstr "MIME-t�pus:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a mell�klet automatikus megjelen�t�s�t"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 
@@ -9886,45 +10045,45 @@ msgstr "C�mjegyz�kben val� keres�shez kattints ide"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "V�laszc�m:"
 
 #.
-#. * From:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:389
 msgid "From:"
 msgstr "Felad�:"
 
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:391
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "T�rgy:"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "C�mzett:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "�rd be a lev�l c�mzettj�t"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "M�solat:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�rd be, kik kapjanak m�solatot a lev�lr�l"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Rejtett m�solat:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9932,17 +10091,25 @@ msgstr ""
 "�rd be azokat a c�meket, akik rejtett m�solatot kapnak a lev�lr�l, azaz a "
 "c�mzettn�l nem jelenik meg a c�m�k."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "F�jl csatol�sa"
 
-#: composer/e-msg-composer.c:515
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nem siker�lt l�trehozni a PGP al��r�s r�szt."
 
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9951,34 +10118,34 @@ msgstr ""
 "F�jlbeolvas�si hiba: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1035
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Figyelem!"
 
-#: composer/e-msg-composer.c:1039
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "A f�jl l�tezik, fel�l�rod?"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "F�jlment�si hiba: %s"
 
-#: composer/e-msg-composer.c:1081
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "F�jlbet�lt�si hiba: %s"
 
-#: composer/e-msg-composer.c:1112
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "F�jlel�r�si hiba: %s"
 
-#: composer/e-msg-composer.c:1120
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nem siker�lt bet�lteni a levelet a szerkeszt�b�l"
 
-#: composer/e-msg-composer.c:1127
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9987,7 +10154,7 @@ msgstr ""
 "Nem siker�lt keresni a f�jlban: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1134
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9996,7 +10163,7 @@ msgstr ""
 "Nem siker�lt csonkolni a  f�jlt: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1143
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10005,7 +10172,7 @@ msgstr ""
 "Hiba a levelek automatikus ment�se k�zben: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1243
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10014,7 +10181,7 @@ msgstr ""
 "f�jlokat.\n"
 "Szeretn�d megk�s�relni a vissza�ll�t�sukat?"
 
-#: composer/e-msg-composer.c:1389
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10024,43 +10191,39 @@ msgstr ""
 "\n"
 "Akarod menteni a v�ltoz�saidat?"
 
-#: composer/e-msg-composer.c:1396
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: composer/e-msg-composer.c:1428
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "F�jl megnyit�s"
 
-#: composer/e-msg-composer.c:1566
-msgid "Insert File"
-msgstr "F�jl beilleszt�se"
-
-#: composer/e-msg-composer.c:1836
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1873
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "_Al��r�s"
 
-#: composer/e-msg-composer.c:1914 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1926
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (alap�rtelmezett)"
 
-#: composer/e-msg-composer.c:2103 composer/e-msg-composer.c:2708
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Lev�l �r�sa"
 
-#: composer/e-msg-composer.c:2725
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10068,7 +10231,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:2751 composer/e-msg-composer.c:2806
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10076,9 +10239,9 @@ msgstr ""
 "Nem siker�lt l�trehozni a szerkeszt�ablakot:\n"
 "A HTML-szerkeszt� komponens aktiv�l�sa sikertelen."
 
-#: composer/e-msg-composer.c:3631
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10142,8 +10305,8 @@ msgstr "A t�rgy tartalmazza"
 msgid "Subject does not contain"
 msgstr "A t�rgy nem tartalmazza"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2248
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10151,12 +10314,11 @@ msgstr ""
 "A megadott n�ven m�r l�tezik f�jl.\n"
 "Fel�l�rod?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Jelsz� megjegyz�se"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
 
@@ -10254,122 +10416,72 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:81
-msgid "year"
-msgstr "�v"
-
-#: filter/filter-datespec.c:81
-msgid "years"
-msgstr "�vek"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " m�sodpercek"
 
-#: filter/filter-datespec.c:82
-msgid "month"
-msgstr "h�nap"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "perc"
 
-#: filter/filter-datespec.c:82
-msgid "months"
-msgstr "h�napok"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "�ra"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "h�t"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "hetek"
 
-#: filter/filter-datespec.c:85
-msgid "hour"
-msgstr "�ra"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "h�nap"
 
-#: filter/filter-datespec.c:86
-msgid "minute"
-msgstr "perc"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "h�napok"
 
-#: filter/filter-datespec.c:87 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr " m�sodpercek"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "�v"
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "�vek"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Elfelejtetted kiv�lasztani a d�tumot."
 
-#: filter/filter-datespec.c:198
-msgid "You have chosen an invalid date."
-msgstr "�rv�nytelen d�tumot v�lasztott�l."
-
-#: filter/filter-datespec.c:283
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"A lev�l d�tuma azzal a d�tummal lesz �sszehasonl�tva,\n"
-"amely a sz�r� futtat�sakor vagy a vmappa megnyit�sakor\n"
-"lesz �rv�nyben."
-
-#: filter/filter-datespec.c:306
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"A lev�l d�tuma az itt megadott d�tummal\n"
-"lesz �sszehasonl�tva."
-
-#: filter/filter-datespec.c:346
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"A lev�l d�tuma a sz�r� futtat�s�nak d�tum�hoz\n"
-"viszony�tott d�tumhoz lesz hasonl�tva.\n"
-"P�ld�ul: \"egy hete\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:381
-msgid "the current time"
-msgstr "a pontos id� most"
-
-#: filter/filter-datespec.c:381
-msgid "a time you specify"
-msgstr "megadott id�"
-
-#: filter/filter-datespec.c:382
-msgid "a time relative to the current time"
-msgstr "az id� mostant�l sz�m�tva"
-
-#. The dialog
-#: filter/filter-datespec.c:406
-msgid "Select a time to compare against"
-msgstr "Id� megad�sa"
-
-#. The label
-#: filter/filter-datespec.c:440
-msgid "Compare against"
-msgstr "�sszehasonl�t�s"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
 
-#: filter/filter-datespec.c:558 filter/filter-datespec.c:737
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "most"
 
-#: filter/filter-datespec.c:587
-msgid " ago"
-msgstr " �ta"
-
-#: filter/filter-datespec.c:633
-msgid "ago"
-msgstr "�ta"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y %b %d, %a"
 
-#: filter/filter-datespec.c:723 mail/message-list.c:1105
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " �ta"
 
-#: filter/filter-datespec.c:734
-msgid "<click here to select a date>"
-msgstr "<kattints ide a d�tum kiv�laszt�s�hoz>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Id� megad�sa"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Sz�r� szab�lyok"
 
@@ -10382,7 +10494,7 @@ msgstr "Meg kell adnod egy f�jlnevet"
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' spool nem l�tezik, vagy  nem k�z�ns�ges f�jl."
 
-#: filter/filter-file.c:302
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr "V�lassz egy f�jlt"
 
@@ -10404,7 +10516,7 @@ msgstr ""
 "L�pj vissza, �s adj meg egy �rv�nyes mappanevet, ahov� a leveleket k�red."
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "V�lassz mapp�t"
 
@@ -10417,14 +10529,14 @@ msgstr ""
 "Hiba a '%s' regul�ris kifejez�sben:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:27 mail/mail-config.c:75
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
 #: mail/mail-config.glade.h:62
 msgid "Important"
 msgstr "Fontos"
 
 #. red
 #: filter/filter-label.c:137 mail/mail-config.c:76
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Munka"
 
@@ -10435,7 +10547,7 @@ msgstr "Szem�lyes"
 
 #. forest green
 #: filter/filter-label.c:139 mail/mail-config.c:78
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid "To Do"
 msgstr "Teend�"
 
@@ -10448,84 +10560,133 @@ msgstr "K�s�bb"
 msgid "Test"
 msgstr "Teszt"
 
-#: filter/filter-rule.c:219
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Meg kell adnod a sz�r� nev�t."
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Szab�ly neve:"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "N�vtelen"
 
-#: filter/filter-rule.c:781
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Keres�si felt�telek"
 
-#: filter/filter-rule.c:799
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "M�velet v�grehajt�sa,"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "ha minden felt�tel teljes�l"
 
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "ha b�rmely felt�tel teljes�l"
 
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Felt�tel hozz�ad�sa"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "bej�v�"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "kimen�"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "�sszehasonl�t�s"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Sz�r�k szerkeszt�se"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "VMapp�k szerkeszt�se"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Bej�v�"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Kimen�"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A lev�l d�tuma az itt megadott d�tummal\n"
+"lesz �sszehasonl�tva."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A lev�l d�tuma a sz�r� futtat�s�nak d�tum�hoz\n"
+"viszony�tott d�tumhoz lesz hasonl�tva.\n"
+"P�ld�ul: \"egy hete\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A lev�l d�tuma az itt megadott d�tummal\n"
+"lesz �sszehasonl�tva."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtu�lis mapp�k"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "az id� mostant�l sz�m�tva"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "�ta"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "csak a megadott mapp�k"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "a pontos id� most"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "megadott id�"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "VMappa forr�sok"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "az �sszes akt�v t�voli mapp�val"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "az �sszes helyi �s akt�v t�voli mapp�val"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "az �sszes helyi mapp�val"
 
@@ -10551,41 +10712,42 @@ msgid "Beep"
 msgstr "Hangjelz�s"
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
-msgstr "Parancs"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "tartalmazza"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Mapp�ba m�sol�s"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Fogad�s d�tuma"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "K�ld�s d�tuma"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "T�r�lt"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nem tartalmazza"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nem v�gz�dik"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nem l�tezik"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "nem l�tezik"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nem �gy hangzik, mint"
@@ -10607,82 +10769,83 @@ msgid "ends with"
 msgstr "v�gz�dik"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "H�jparancs kiad�sa"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "L�tezik"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "l�tezik"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Kifejez�s"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "ut�n volt"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "el�tte volt"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "megjel�lt"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "nem megjel�lt"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1726
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr "C�mke"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Levelez�lista"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Lev�lt�rzs"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Lev�l fejl�ce"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�thelyez�s mapp�ba"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "H�jparancs kiad�sa"
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Hangjelz�s"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Olvasott"
 
@@ -10698,57 +10861,87 @@ msgstr "Regex illeszked�s"
 msgid "Replied to"
 msgstr "V�lasz"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "nagyobb mint"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "kisebb mint"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontsz�m"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1555
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Felad�"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "�llapot be�ll�t�sa"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "H�jparancs kiad�sa"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "M�ret (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "�gy hangzik, mint"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Forr�spostafi�k"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Adott fejl�c"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "�gy kezd�dik:"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Feldolgoz�s le�ll�t�sa"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "T�rgy"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "�llapot be�ll�t�sa"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Szab�lyok"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Szab�ly hozz�ad�sa"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Szab�ly szerkeszt�se"
 
@@ -10792,7 +10985,7 @@ msgstr "%s p�szt�z�sa"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:315
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Lev�l"
 
@@ -10858,7 +11051,7 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evolution import�lja a r�gi Netscape adatokat."
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1076
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Kuka"
@@ -11016,7 +11209,7 @@ msgstr "Tulajdons�gok..."
 msgid "Change this folder's properties"
 msgstr "Mappa tulajdons�gainak m�dos�t�sa"
 
-#: mail/component-factory.c:759
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11024,230 +11217,245 @@ msgstr ""
 "A levelez�d egyes be�ll�t�sai hib�snak t�nnek, ellen�rizd, hogy minden "
 "rendben van-e."
 
-#: mail/component-factory.c:921
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "A lev�lk�ld�s m�dja nincs be�ll�tva"
 
-#: mail/component-factory.c:943
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:949
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Figyelem: M�dos�tott lev�l"
 
-#: mail/component-factory.c:990
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "�j lev�l"
 
-#: mail/component-factory.c:990 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Lev�l"
 
-#: mail/component-factory.c:991
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Lev�l �r�sa"
 
-#: mail/component-factory.c:1018
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "�j lev�l"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Lev�l _nyomtat�sa"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Lev�l �r�sa"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem siker�lt az Evolution levelez� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1027
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nem siker�lt az Evolution levelez�be�ll�t� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1033
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nem siker�lt az Evolution mappainf� komponens�t inicializ�lni."
 
-#: mail/component-factory.c:1258 mail/component-factory.c:1288
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
-#: mail/component-factory.c:1299
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Nem siker�lt regisztr�lni a t�rol�t a h�jban"
 
-#: mail/folder-browser-ui.c:428
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" tulajdons�gai"
 
-#: mail/folder-browser-ui.c:430
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Tulajdons�gok"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nem siker�lt l�trehozni az ideiglenes k�nyvt�rat: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d �j"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d rejtett"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d l�that�"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d kijel�lve"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d post�zand�"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d elk�ldve"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "�sszesen %d"
 
-#: mail/folder-browser.c:1092
+#: mail/folder-browser.c:1091
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtu�lis mappa gy�rt�sa a keres�sb�l"
 
-#: mail/folder-browser.c:1662
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VMappa a _t�rgyra"
 
-#: mail/folder-browser.c:1663
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _felad�ra"
 
-#: mail/folder-browser.c:1664
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _c�mzettekre"
 
-#: mail/folder-browser.c:1665
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:1669
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Sz�_r� a t�rgyra"
 
-#: mail/folder-browser.c:1670
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Sz�r� a f_elad�ra"
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Sz�r� a _c�mzettekre"
 
-#: mail/folder-browser.c:1672 mail/folder-browser.c:2006
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Sz�r� a _levelez�list�ra"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "S_zerkeszt�s �j lev�lk�nt..."
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Nyomtat�s"
 
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:108
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_V�lasz a felad�nak"
 
-#: mail/folder-browser.c:1697 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "V�lasz a _list�nak"
 
-#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "V�lasz _mindenkinek"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr "_K�sz z�szl�"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "_Z�szl� t�rl�se"
 
 #. separator here?
-#: mail/folder-browser.c:1709 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "_Vissza�ll�t�s"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "�_thelyez�s mapp�ba..."
 
-#: mail/folder-browser.c:1722 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_M�sol�s mapp�ba..."
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "_Felad� hozz�ad�sa a c�mjegyz�khez"
 
-#: mail/folder-browser.c:1734
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "_Sz�r�k alkalmaz�sa"
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "S_zab�ly gy�rt�sa lev�lb�l"
 
-#: mail/folder-browser.c:2007
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "VMappa a _levelez�list�ra"
 
-#: mail/folder-browser.c:2009
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "S_z�r� a levelez�list�ra (%s)"
 
-#: mail/folder-browser.c:2010
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "V_Mappa a levelez�list�ra (%s)"
@@ -11320,19 +11528,19 @@ msgstr "Nem adtad meg az �sszes sz�ks�ges inform�ci�t."
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafi�k-szerkeszt�"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:158
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_G�p:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:128
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Felhaszn�l�n�v:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "�_tvonal:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhatsz l�tre k�t egyez� nev� postafi�kot."
 
@@ -11378,30 +11586,30 @@ msgstr "Protokoll"
 msgid "Mail to %s"
 msgstr "Lev�l %s-nek"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "A t�ma %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Lev�l %s-t�l"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelez�lista"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Sz�r�szab�ly hozz�ad�sa"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11413,7 +11621,7 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11425,7 +11633,7 @@ msgstr ""
 "k�ldhetn�l, fogadhatn�l vagy �rhatn�l.\n"
 "Szeretn�d most be�ll�tani?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11433,7 +11641,7 @@ msgstr ""
 "Be kell �ll�tanod egy azonos�t�t,\n"
 "miel�tt levelet k�ldesz."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11442,7 +11650,7 @@ msgstr ""
 "miel�tt levelet k�ldesz."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:198
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11450,11 +11658,11 @@ msgstr ""
 "HTML form�tum� levelet k�ldesz, de ezek a c�mzettek nem akarnak HTML "
 "form�tum� leveleket kapni:\n"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Mindenk�pp elk�ld�d?"
 
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11462,7 +11670,7 @@ msgstr ""
 "Nincs t�rgya a lev�lnek.\n"
 "T�nyleg elk�ldjem?"
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11470,11 +11678,11 @@ msgstr ""
 "Mivel a c�mlista �gy van be�ll�tva, hogy rejtse el a tagok c�m�t, a lev�l "
 "csak titkos c�mzetteket fog tartalmazni."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "A lev�l csak titkos c�mzetteket tartalmaz."
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11484,11 +11692,11 @@ msgstr ""
 "fejl�c hozz�ad�s�val.\n"
 "M�gis elk�ld�d?"
 
-#: mail/mail-callbacks.c:426
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Meg kell adnod c�mzetteke, miel�tt elk�ldhetn�d a levelet."
 
-#: mail/mail-callbacks.c:615
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11496,28 +11704,28 @@ msgstr ""
 "Nem siker�lt megnyitni az ehhez a postafi�khoz tartoz� piszkozatok mapp�t.\n"
 "Szeretn�d haszn�lni az alap�rtelmezett piszkozatok mapp�t?"
 
-#: mail/mail-callbacks.c:992
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "ismeretlen felad�"
 
-#: mail/mail-callbacks.c:996
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltez�ssel %%s ezt �rta:"
 
-#: mail/mail-callbacks.c:1436 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Lev�l(levelek) �thelyez�se m�s mapp�ba"
 
-#: mail/mail-callbacks.c:1438 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Lev�l(levelek) m�sol�sa m�s mapp�ba"
 
-#: mail/mail-callbacks.c:2092
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "T�nyleg szerkeszteni szeretn�d mind a %d levelet?"
 
-#: mail/mail-callbacks.c:2117
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11525,7 +11733,7 @@ msgstr ""
 "Csak a Piszkozatok mapp�ban l�v� \n"
 "leveleket lehet szerkeszteni."
 
-#: mail/mail-callbacks.c:2156
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11533,39 +11741,39 @@ msgstr ""
 "Csak az Elk�ld�tt mapp�ban l�v� \n"
 "leveleket lehet �jra elk�ldeni."
 
-#: mail/mail-callbacks.c:2170
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "T�nyleg �jra akarod k�ldeni mind a %d �zenetet?"
 
-#: mail/mail-callbacks.c:2196
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Nincs lev�l kijel�lve"
 
-#: mail/mail-callbacks.c:2241 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Fel�l�rod a f�jlt?"
 
-#: mail/mail-callbacks.c:2295
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Lev�l ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2297
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Levelek ment�se m�sk�nt..."
 
-#: mail/mail-callbacks.c:2368
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "A k�vetkez� olvasatlan lev�l megjelen�t�se"
 
-#: mail/mail-callbacks.c:2375
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2618
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11577,7 +11785,7 @@ msgstr ""
 "\n"
 "T�nyleg t�rl�d ezeket a leveleket?"
 
-#: mail/mail-callbacks.c:2731
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11586,28 +11794,28 @@ msgstr ""
 "Hiba a sz�r�inform�ci�k bet�lt�se k�zben:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2743
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Sz�r�k..."
 
-#: mail/mail-callbacks.c:2787
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/mail-callbacks.c:2840
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Lev�l nyomtat�sa"
 
-#: mail/mail-callbacks.c:2867
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2906
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Lev�l nyomtat�sa sikertelen"
 
-#: mail/mail-callbacks.c:3093 mail/mail-callbacks.c:3134
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "T�nyleg k�l�n ablakban akarod megnyitni mind a %d levelet?"
@@ -11629,7 +11837,7 @@ msgstr "Nincs le�r�s"
 msgid "Please specify a valid script name"
 msgstr "Meg kell adnod egy c�mkenevet"
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2768
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "N�vtelen"
 
@@ -11648,20 +11856,21 @@ msgid "Add Signature"
 msgstr "_Al��r�s"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Add meg a neved �s az e-mail c�medet. A \"nem k�telez�\" mez�ket csak akkor "
 "kell kit�ltened, ha szeretn�d felt�ntetni ezeket az adatokat a kimen� "
 "leveleidben."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Add meg a bej�v� leveleidet kezel� kiszolg�l�val kapcsolatos inform�ci�kat.\n"
 "Ha nem tudod, hogy milyen kiszolg�l�t haszn�lsz, k�rdezd meg a rendszer-\n"
@@ -11672,24 +11881,23 @@ msgid "Please select among the following options"
 msgstr "V�lassz az al�bbi lehet�s�gek k�z�l"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Add meg a kimen� leveleidet kezel� protokollal kapcsolatos inform�ci�kat. \n"
 "Ha nem tudod, hogy milyen protokollt haszn�lsz, k�rdezd meg a rendszer-\n"
 "gazd�dat, vagy az internetszolg�ltat�dat."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Majdnem k�sz van a levelez� be�ll�t�s�nak folyamata. Az azonos�t�, a bej�v� "
 "levelek kiszolg�l�ja �s a kimen� levelek tov�bb�t�s�nak m�dja egy�ttesen "
@@ -11697,20 +11905,20 @@ msgstr ""
 "csak az Evolution programban jelenik meg."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafi�k var�zsl�"
 
-#: mail/mail-config.c:617
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "%d. postafi�k"
 
-#: mail/mail-config.c:2488
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Szolg�ltat�s ellen�rz�se"
 
-#: mail/mail-config.c:2566 mail/mail-config.c:2570
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Kapcsol�d�s a kiszolg�l�hoz..."
 
@@ -12042,103 +12250,108 @@ msgstr "_Jelsz� megjegyz�se"
 msgid "Required Information"
 msgstr "Sz�ks�ges inform�ci�"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "_Alap�rt�kek"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Biztons�gos MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr "V�laszd ki a fix sz�less�g� bet�t a HTML-hez"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr "V�laszd ki a fix sz�less�g� bet�t a HTML nyomtat�s�hoz"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML-hez"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr "V�laszd ki a v�ltoz� sz�less�g� bet�t a HTML nyomtat�s�hoz"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr "V�laszd ki a PGP programot"
 
-#: mail/mail-config.glade.h:107 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "El_k�ld�tt levelek mapp�ja"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Elk�ld�tt levelek �s piszkozatok"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolg�l� megk�veteli a _hiteles�t�st"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Kiszolg�l� be�ll�t�sa"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Kiszolg�l� _t�pusa: "
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Ind�t�ikonok t�pusa:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr "1. al��r�s"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr "2. al��r�s"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_F�jln�v megad�sa:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Nyelvek"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Helyes�r�s-ellen�rz�s"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Szabv�nyos Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 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:124
+#: mail/mail-config.glade.h:125
 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:126
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12146,11 +12359,11 @@ msgstr ""
 "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
 "P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V�_ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12160,179 +12373,179 @@ msgstr ""
 "\n"
 "A folytat�shoz kattints a \"Tov�bb\" gombra."
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Al��r�s"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 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:139
+#: mail/mail-config.glade.h:140
 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:140
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Hiteles�t�si t�pus:"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Az �j _levelek automatikus lek�rdez�se"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr "_Hangjelz�s �j lev�l be�rkez�sekor"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Tan�s�tv�nyazonos�t�:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 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:148
 msgid "_Default signature:"
 msgstr "_Alap�rtelmezett al��r�s:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne �rtes�tsen, ha �j lev�l �rkezik"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Enged�lyez�s"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr "F_ix sz�less�g�:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Tov�bb�t�s st�lusa"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Teljes n�v:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr "_HTML lev�l"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr "_Szem�lyazonoss�g"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 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:162
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alap�rtelmezett postafi�k"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 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:163
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_N�v:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 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:165
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP program el�r�si �tja:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 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:169
 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:170
 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:171
 msgid "_Receiving Mail"
 msgstr "_Levelek fogad�sa"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr "_V�lasz st�lusa:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr "_Alap�rt�kek"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:174 ui/evolution-message-composer.xml.h:51
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Biztons�g"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr "_Lev�l k�ld�se"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Anim�lt k�pek megjelen�t�se"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Al��r�s"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr "_Biztons�gos kapcsolat haszn�lata (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr "_V�ltoz� sz�less�g�:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_minden"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "sz�n"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "le�r�s"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12356,199 +12569,209 @@ msgstr "Nem siker�lt l�trehozni az S/MIME bor�t�k r�szt."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nem siker�lt l�trehozni az S/MIME dek�dol� r�szt."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nem siker�lt l�trehozni a '%s' ideiglenes f�jlt: %s"
 
-#: mail/mail-display.c:390
+#: mail/mail-display.c:430
 #, fuzzy
 msgid "Save Attachment..."
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Megtekint�s be�gyazva"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyit�s ezzel: %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Megtekint�s be�gyazva (%s seg�ts�g�vel)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Rejt�s"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "K�ls� n�z�ke"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "K�pek bet�lt�se"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�zenet tartalm�nak bet�lt�se"
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr "Lej�rt elemek:"
 
-#: mail/mail-display.c:1830
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Hivatkoz�s megnyit�sa b�ng�sz�ben"
 
-#: mail/mail-display.c:1831
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Hivatkoz�s hely�nek m�sol�sa"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Hivatkoz�s ment�se m�sk�nt (FIXME)"
 
-#: mail/mail-display.c:1835
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "K�p ment�se m�sk�nt..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s mell�klet"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nem siker�lt �rtelmezni a MIME-�zenetet. Megjelen�t�s forr�sk�nt."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "D�tum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Rossz c�m"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Felad�"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "V�laszc�m"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "C�mzett"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "M�solat"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Rejtett m�solat"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "Levelez�"
 
-#: mail/mail-format.c:1737
-msgid "View messages..."
-msgstr "�zenetek megtekint�se..."
-
-#: mail/mail-format.c:1833
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Az �zenetet digit�lisan al��rt�k. Tov�bbi inform�ci��rt kattints a lakat "
 "ikonra."
 
-#: mail/mail-format.c:1860
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nem siker�lt l�trehozni a PGP ellen�rz�s r�szt."
 
-#: mail/mail-format.c:1869
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Az �zenetet digit�lisan al��rt�k, �s az al��r�s hiteles."
 
-#: mail/mail-format.c:1877
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Az �zenetet digit�lisan al��rt�k, de nem bizony�that�, hogy hiteles."
 
-#: mail/mail-format.c:2127
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Mutat� FTP-helyre (%s)"
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Mutat� helyi f�jlra (%s), amely \"%s\" helyen �rv�nyes"
 
-#: mail/mail-format.c:2146
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Mutat� hely f�jlra (%s)"
 
-#: mail/mail-format.c:2175
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Mutat� t�voli adatra (%s)"
 
-#: mail/mail-format.c:2183
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Mutat� ismeretlen k�ls� adatra (\"%s\" t�pus)"
 
-#: mail/mail-format.c:2188
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Hib�s k�ls� t�rzsr�sz."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Helyi mapp�k"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Mappa �jrabe�ll�t�sa"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Nem siker�lt elmenteni a mappa metainf�j�t, val�sz�n�leg nem tudod t�bb� "
 "megnyitni ezt mapp�t: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nem siker�lt menteni a mappa metainf�j�t %s-be: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nem siker�lt t�r�lni a mapp�t metaadatait: %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" mappa �talak�t�sa \"%s\" form�tumra"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s-t be�ll�t�sait nem lehet megv�ltoztatni, mert az nem helyi mappa"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12556,16 +12779,16 @@ msgstr ""
 "Ha nem tudod t�bb� megnyitni ezt a postafi�kot, \n"
 "akkor esetleg k�zzel kell megjav�tanod."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nem v�ltoztathatod meg nem helyi mapp�k form�tum�t."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �jrabe�ll�t�sa"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12574,7 +12797,7 @@ msgstr ""
 "Hiba `%s' k�zben:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12583,7 +12806,7 @@ msgstr ""
 "Hiba a m�velet v�grehajt�sa k�zben:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "V�rj"
 
@@ -12591,100 +12814,100 @@ msgstr "V�rj"
 msgid "Filtering Folder"
 msgstr "Mappa sz�r�se"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Levelek fogad�sa"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "A lev�l ennek ellen�re sikeresen elment."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' k�ld�se"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d �zenet k�ld�se"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Hiba a %d / %d �zenetn�l"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "K�sz."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Lev�l ment�se a mapp�ba"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek �thelyez�se %s-be"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek m�sol�sa %s-be"
 
-#: mail/mail-ops.c:1026
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mapp�k p�szt�z�sa \"%s\"-ben"
 
-#: mail/mail-ops.c:1209
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Tov�bb�tott levelek"
 
-#: mail/mail-ops.c:1252
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyit�sa"
 
-#: mail/mail-ops.c:1324
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "%s t�rol� megnyit�sa"
 
-#: mail/mail-ops.c:1393
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa elt�vol�t�sa"
 
-#: mail/mail-ops.c:1487
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa t�rol�sa"
 
-#: mail/mail-ops.c:1538
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Mappa friss�t�se"
 
-#: mail/mail-ops.c:1574
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Mappa tiszt�t�sa"
 
-#: mail/mail-ops.c:1623
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s lev�l let�lt�se"
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d lev�l let�lt�se"
 
-#: mail/mail-ops.c:1781
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d lev�l ment�se"
 
-#: mail/mail-ops.c:1893
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12693,7 +12916,7 @@ msgstr ""
 "Nem siker�lt l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12702,11 +12925,11 @@ msgstr ""
 "Hiba a levelek ment�se k�zben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Mell�klet ment�se"
 
-#: mail/mail-ops.c:2012
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12715,27 +12938,22 @@ msgstr ""
 "Nem lehet l�trehozni a kimeneti f�jlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem siker�lt az adatok ki�r�sa: %s"
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Sz�tkapcsol�d�s %s kiszolg�l�val"
 
-#: mail/mail-ops.c:2190
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "�jrakapcsol�d�s %s kiszolg�l�hoz"
 
-#: mail/mail-ops.c:2271
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "H�jparancs v�grehajt�sa: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:512
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Keres�s"
 
@@ -12806,16 +13024,25 @@ msgstr "Friss�t�s folyamatban..."
 msgid "Waiting..."
 msgstr "V�rakoz�s..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "A felhaszn�l� megszak�totta a m�veletet."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Jelsz� megjegyz�se"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Jelsz� megjegyz�se a munkafolyamat h�tralev� r�sz�re"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�rd be %s jelszav�t"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "�rd be a jelsz�t"
 
@@ -12845,7 +13072,7 @@ msgstr ""
 "�rd be azt a nevet, amellyel hivatkozni szeretn�l erre a postafi�kra.\n"
 "P�ld�ul: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "N�v:"
 
@@ -12889,7 +13116,7 @@ msgstr "Vmappa be�ll�t�sa: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Vmapp�k friss�t�se erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12902,94 +13129,97 @@ msgstr ""
 "    '%s'\n"
 "�s friss�tve lettek."
 
-#: mail/mail-vfolder.c:728 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VMapp�k"
 
-#: mail/mail-vfolder.c:790
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMapp�k"
 
-#: mail/mail-vfolder.c:832
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "VMappa szerkeszt�se"
 
-#: mail/mail-vfolder.c:848
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "A nem l�zet� '%s' vmapp�t pr�b�lod szerkeszteni."
 
-#: mail/mail-vfolder.c:902
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "�j VMappa"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Nincs t�rgy)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - �zenet"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Nem n�zett"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "N�zett"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Megv�laszolt"
 
-#: mail/message-list.c:725
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "T�bb l�thatatlan lev�l"
 
-#: mail/message-list.c:726
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "T�bb lev�l"
 
-#: mail/message-list.c:730
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:731
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:735
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1085
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1097
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%Y %d %b"
 
-#: mail/message-list.c:2539
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Lev�llista l�trehoz�sa"
 
@@ -13024,46 +13254,46 @@ msgstr "�rkezett"
 msgid "Size"
 msgstr "M�ret"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Ugr�s el�re "
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Forr�sinform�ci�"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Tov�bb�t�s"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Nem sz�ks�ges v�laszolni"
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "V�lasz"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "V�lasz mindenkinek"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr "�tn�z�s"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "FIXME: _Z�szl� folytat�shoz..."
@@ -13088,16 +13318,16 @@ msgstr "Feliratkoz�s \"%s\" mapp�ra"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Leiratkoz�s \"%s\" mapp�r�l"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappa"
 
-#: mail/subscribe-dialog.c:1516
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Nincs kiszolg�l� kiv�lasztva."
 
-#: mail/subscribe-dialog.c:1577
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "V�lassz egy kiszolg�l�t."
 
@@ -17559,11 +17789,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -22979,8 +23211,8 @@ msgstr "Nincs le�r�s"
 msgid "Mail summary"
 msgstr "�sszefoglal� a levelekr�l"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:412
-#: my-evolution/e-summary-mail.c:740 shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Helyi mapp�k"
 
@@ -22998,15 +23230,15 @@ msgstr "LHBP:LHSY"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com -- A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "A nap mond�sa"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "�j h�rforr�s hozz�ad�sa"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Add meg a hozz�adand� h�rforr�s URL-j�t"
 
@@ -23018,24 +23250,24 @@ msgstr "Hiba az RDF let�lt�se k�zben"
 msgid "News Feed"
 msgstr "H�rforr�s"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Mindenki"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Hozz�ad�s"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Megjelen�tve"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Nincsenek feladatok"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Nincs le�r�s)"
 
@@ -24307,7 +24539,8 @@ msgid "Tasks "
 msgstr "Feladatok "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Id�j�r�s be�ll�t�sa"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24383,7 +24616,7 @@ msgid "Drafts"
 msgstr "Piszkozatok"
 
 #: shell/e-local-storage.c:179 shell/e-shell-view.c:397
-#: shell/e-shortcuts.c:1061
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Be�rkezett levelek"
 
@@ -24627,8 +24860,9 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - �j mappa k�sz�t�se"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "�_j mappa l�trehoz�sa..."
 
 #: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
@@ -24832,8 +25066,14 @@ msgstr "Mappa megnyit�sa: \"%s\""
 msgid "in \"%s\" ..."
 msgstr "\"%s\"-ben ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nem siker�lt �tnevezni ezt a mapp�t: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+#, fuzzy
+msgid "Cannot find the specified shared folder."
 msgstr "A megadott megosztott mappa nem nyithat� meg."
 
 #: shell/e-shell-startup-wizard.c:159
@@ -24850,8 +25090,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Nem siker�lt elind�tani az Evolution Levelez�be�ll�t� Var�zsl� fel�let�t\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�j"
@@ -24892,23 +25132,24 @@ msgstr "Ugr�s mapp�ba..."
 msgid "Select the folder that you want to open"
 msgstr "V�laszd ki a megnyitand� mapp�t"
 
-#: shell/e-shell-view-menu.c:597 ui/evolution.xml.h:11
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "�j ind�t�ikon l�trehoz�sa"
 
-#: shell/e-shell-view-menu.c:598
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "V�laszd ki az ind�t�ikon c�lpontj�t k�pez� mapp�t:"
 
-#: shell/e-shell-view-menu.c:765
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Munka a h�l�zatban"
 
-#: shell/e-shell-view-menu.c:778 ui/evolution.xml.h:62
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "K_apcsolat n�lk�li munka"
 
-#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:39
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Kapcsolat n�lk�li munka"
 
@@ -25015,87 +25256,97 @@ msgstr "Ind�t�ikon-csoport �tnevez�se"
 msgid "Rename selected shortcut group to:"
 msgstr "A kijel�lt ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Kis ikonok"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Kis ikonok megjelen�t�se az elemeken"
 
-#: shell/e-shortcuts-view.c:231
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Nagy ikonok"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Nagy ikonok megjelen�t�se az elemeken"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "�_j csoport..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "�j ind�t�csoport l�trehoz�sa"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Csoport elt�vol�t�sa..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Ind�t�csoport elt�vol�t�sa az ind�t�s�vr�l"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "C_soport �tnevez�se..."
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:255
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Ind�t�s�v el_rejt�se"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ind�t�s�v elrejt�se"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "�j ind�t�ikon l�trehoz�sa"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "�j ind�t�ikon l�trehoz�sa"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Ind�t�ikon �tnevez�se"
 
-#: shell/e-shortcuts-view.c:376
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Ind�t�ikon-csoport �tnevez�se erre:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Az ind�t�ikonhoz tartoz� mappa megnyit�sa"
 
-#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Megnyit�s �j _ablakban"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:410
 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:394
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "�_tnevez�s"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Ind�t�ikon-csoport �tnevez�se"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_T�rl�s"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 
@@ -25103,7 +25354,7 @@ msgstr "Vedd le ezt az elemet az ind�t�s�vr�l"
 msgid "Error saving shortcuts."
 msgstr "Nem siker�l elmenteni az elemeket."
 
-#: shell/e-shortcuts.c:1053
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Ind�t�ikonok"
 
@@ -25214,63 +25465,63 @@ msgstr ""
 "Az aktiv�l�rendszer �ltal adott hiba:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA hiba"
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Megszak�tva"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "�rv�nytelen argumentum"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "M�r van tulajdonos"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Nincs tulajdonos"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nem tal�lhat�"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nem t�mogatott t�pus"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nem t�mogatott s�ma"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nem t�mogatott m�velet"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Bels� hiba"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "L�tezik"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "�rv�nytelen URI"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Van almapp�ja."
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Nincs hely"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "A r�gi tulajdonos meghalt"
 
@@ -25570,119 +25821,107 @@ msgstr "Kijel�l�s m�sol�sa"
 msgid "Copy to Folder..."
 msgstr "Mapp�ba m�sol�s..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "�j n�vjegy k�sz�t�se"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "�j c�mlista k�sz�t�se"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Kijel�l�s kiv�g�sa"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Kijel�lt n�vjegyek t�rl�se"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "N�vjegyek �thelyez�se m�sik mapp�ba..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "�thelyez�s mapp�ba..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "V�g�lap beilleszt�se"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "A nyomtatand� n�vjegyek nyomtat�si k�pe"
 
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-calendar.xml.h:16
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Nyomtat�si _k�p"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Kijel�lt n�vjegyek nyomtat�sa"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Kijel�lt n�vjegyek ment�se VCard-k�nt."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Mindet kijel�li"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Az �sszes n�vjegy kijel�l�se"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Lev�l k�ld�se a kijel�lt c�mekre."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Lev�l k�ld�se ennek a szem�lynek"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "A kijel�lt n�vjegy elk�ld�se valakinek."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Le�ll�t�s"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Bet�lt�s le�ll�t�sa"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "N�vjegy megtekint�se"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_M�veletek"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_C�mlista"
-
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "N�vjegy _tov�bb�t�sa..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "�_thelyez�s mapp�ba..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Ment�s VCard-k�nt"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_N�vjegy keres�se"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Mindet kijel�li"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Lev�l _k�ld�se ennek a szem�lynek..."
 
@@ -25783,8 +26022,8 @@ msgstr "El�n�zeti k�pet ad a nyomtatand� elemr�l"
 msgid "Print this item"
 msgstr "Elem nyomtat�sa"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Ment�s"
 
@@ -25809,7 +26048,7 @@ msgstr "Elem ment�se lemezre"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:42
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
@@ -25821,7 +26060,7 @@ msgstr "_Bor�t�k nyomtat�sa..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "M_ent�s m�sk�nt..."
 
@@ -25835,7 +26074,7 @@ msgstr "Lev�l _k�ld�se ennek a szem�lynek..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:47
 #: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Ment�s"
@@ -25933,26 +26172,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Minden t�r�lt lev�l v�gleges elt�vol�t�sa az �sszes mapp�b�l"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "�j lev�l"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "A lev�l m�sol�sa �j mapp�ba"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Lev�lbetekint�-ablak megjelen�t�se"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Feliratkoz�s �s leiratkoz�s t�voli kiszolg�l�k mapp�ira"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Virtu�lis mapp�k szerkeszt�je..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Sz�r�k..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Betekint� ablakt�bla"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Feliratkoz�s mapp�kra..."
 
@@ -26308,162 +26557,172 @@ msgid "P_revious Unread Message"
 msgstr "_El�z� olvasatlan lev�l"
 
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "V�lasz feladatra"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "�j levelek keres�se az �sszes mapp�ban"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "_El�z� fontos lev�l"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "El�n�zeti k�pet ad a nyomtatand� lev�lr�l"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "El�z�"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Lev�l nyomtat�sa"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "�t_ir�ny�t�s"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "A kijel�lt lev�l �tir�ny�t�s valakinek"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Helyre�ll�tja a sz�veg eredeti bet�m�ret�t"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Keres�s a lev�lben..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "K_isebb"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Lev�l ment�se sz�vegf�jlk�nt"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Sz�veg keres�se a megjelen�tett lev�l t�rzs�ben"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Oldalbe�ll�t�s az aktu�lis nyomtat�hoz"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Lev�l forr�s�nak megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Teljes _fejl�c megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Lev�l megjelen�t�se a szok�sos st�lusban"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Lev�l megjelen�t�se a teljes fejl�ccel"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Lev�l nyers forr�s�nak megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "S_z�veg bet�m�rete"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "A kijel�lt levelek t�rl�s�nek visszavon�sa"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VMappa a _levelez�list�ra..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VMappa a _felad�ra..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VMappa a _c�mzettekre..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VMappa a _t�rgyra..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Mell�kletk�nt"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_M�sol�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Sz�r� _gy�rt�sa lev�lb�l"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Lev�l _tov�bb�t�sa"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Ugr�s"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Be�gyazva"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "N_agyobb"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Lev�l _megjelen�t�se"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "�_thelyez�s mapp�ba"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_K�vetkez� lev�l"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Szok�sos megjelen�t�s"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Lev�l _megnyit�sa"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_El�z� lev�l"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Id�zetk�nt"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Resend..."
 msgstr "_�jrak�ld�s..."
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:60
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Eszk�z�k"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Vissza�ll�t�s"
 
@@ -26472,14 +26731,14 @@ msgid "Close this window"
 msgstr "Ablak bez�r�sa"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:39
 #: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Bez�r�s"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:52 ui/evolution.xml.h:61
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_N�zet"
 
@@ -26507,163 +26766,161 @@ msgstr "Lev�l titkos�t�sa S/MIME titkos�t�si tan�s�tv�nnyal"
 msgid "For_mat"
 msgstr "For_m�tum"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Sz�veg_f�jl beilleszt�se..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Egy f�jl beilleszt�se a lev�lbe sz�vegk�nt"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Sz�vegf�jl beilleszt�se..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Megnyit�s"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "F�jlmegnyit�s"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP titkos�t�s"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP al��r�s"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME titkos�t�s"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME al��r�s"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Ment�s m�sk�nt"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "_Piszkozat ment�se"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Ment�s mapp�ba..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Az aktu�lis f�jl ment�se"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Az aktu�lis f�jl ment�se m�s n�ven"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "A lev�l ment�se a megadott mapp�ba"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "K�ld�s"
 
-#: ui/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Lev�l k�ld�se HTML form�tumban"
 
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Send this message"
 msgstr "A lev�l elk�ld�se most"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Mell�kletek megjelen�t�se / elrejt�se"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Mell�kletek megjelen�t�se"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Mell�kletek megjelen�t�se"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "A lev�l al��r�sa a PGP kulcsoddal"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "A lev�l al��r�sa az S/MIME al��r�stan�s�tv�nyoddal"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Megjelenjen-e a Rejtett m�solat mez�"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Megjelenjen-e a M�solat mez�"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Megjelenjen-e a Felad� kiv�laszt�mez�"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Megjelenjen-e a V�laszc�m mez�"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Mell�klet..."
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Rejtett m�solat mez�"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_M�solat mez�"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Mindet t�rli"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Felad� mez�"
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Beilleszt�s"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Megnyit�s..."
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_V�laszc�m mez�"
 
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
 #: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Az elem ment�se �s a p�rbesz�dablak bez�r�sa"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:50
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_S�g�"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "1. al��r�s"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Mappa hozz�ad�sa az el�fizetett mapp�k list�j�hoz"
@@ -26781,6 +27038,10 @@ msgstr "Hivatkoz�s l�trehoz�sa ehhez a mapp�hoz az ind�t�s�von"
 msgid "Create a new folder"
 msgstr "�j mappa l�trehoz�sa"
 
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "�j ind�t�ikon l�trehoz�sa"
+
 #: ui/evolution.xml.h:12
 #, fuzzy
 msgid "Create a new window displaying this folder"
@@ -26903,45 +27164,51 @@ msgid "_Folder Bar"
 msgstr "_Mappas�v"
 
 #: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mappa"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Mapp�ra _ugr�s..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Import�l�s..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "�_thelyez�s..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "�_j"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "�j _mappa"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 msgid "_Preferences..."
 msgstr "_Be�ll�t�sok..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "�_tnevez�s..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_K�ld�s / Fogad�s"
 
-#: ui/evolution.xml.h:58
-msgid "_Shortcut"
-msgstr "_Ind�t�ikon"
-
 #: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Ind�t�s�v"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Ind�t�ikon"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "�sszefoglal� nyomtat�sa"
@@ -27178,11 +27445,11 @@ msgstr "Karakterk�dol�s"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Keres�sszerkeszt�"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Keres�s ment�se"
 
@@ -27219,11 +27486,11 @@ msgstr "�zenet"
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg t�bb� ez az �zenet."
 
-#: widgets/misc/e-search-bar.c:518
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "_Keres�s most"
 
-#: widgets/misc/e-search-bar.c:519
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr "_T�rl�s"
 
@@ -27245,19 +27512,83 @@ msgstr "A Personal Addressbook Server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "A Personal Calendar Server; napt�r factory"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nem siker�lt a GNOME-VFS inicializ�l�sa"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nem siker�lt a GNOME inicializ�l�sa"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 
 #~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Kibocs�t�: %s\n"
+#~ "T�ma: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "�dv�zl� v�lasz hiba: %s: tal�n nem v�gzetes"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Id�t�ll�p�s a HELO k�r�sn�l: %s: nem v�gzetes"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO v�lasz hiba: %s: nem v�gzetes"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Id�t�ll�p�s a QUIT k�r�sn�l: %s: nem v�gzetes"
+
+#~ msgid "Insert File"
+#~ msgstr "F�jl beilleszt�se"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "�rv�nytelen d�tumot v�lasztott�l."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "A lev�l d�tuma azzal a d�tummal lesz �sszehasonl�tva,\n"
+#~ "amely a sz�r� futtat�sakor vagy a vmappa megnyit�sakor\n"
+#~ "lesz �rv�nyben."
+
+#~ msgid "Command"
+#~ msgstr "Parancs"
+
+#~ msgid "View messages..."
+#~ msgstr "�zenetek megtekint�se..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "H�jparancs v�grehajt�sa: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - �j mappa k�sz�t�se"
+
+#~ msgid "Create new contact"
+#~ msgstr "�j n�vjegy k�sz�t�se"
+
+#~ msgid "Create new contact list"
+#~ msgstr "�j c�mlista k�sz�t�se"
+
+#~ msgid "_Contact List"
+#~ msgstr "_C�mlista"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Sz�veg_f�jl beilleszt�se..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Egy f�jl beilleszt�se a lev�lbe sz�vegk�nt"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Sz�vegf�jl beilleszt�se..."
+
+#~ msgid ""
 #~ "Evolution is unable to get the addressbook local storage.\n"
 #~ "This may have been caused by the evolution-addressbook component "
 #~ "crashing.\n"
@@ -28067,9 +28398,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "_Organization:"
 #~ msgstr "_Szervezet:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Jelsz� megjegyz�se"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "A levelet _HTML form�tumban k�ldi alap�rtelmez�sk�nt."
 
@@ -28160,9 +28488,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Postafi�kok l�trehoz�sa, szerkeszt�se �s egy�b be�ll�t�sok"
 
-#~ msgid "New Message"
-#~ msgstr "�j lev�l"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_Levelez� be�ll�t�sai"
 
@@ -29529,9 +29854,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgid "label55"
 #~ msgstr "label55"
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "A lev�l m�sol�sa �j mapp�ba"
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "A teljes fejl�c megjelen�t�se"
 
@@ -30079,10 +30401,6 @@ msgstr "init_bonobo(): a Bonobo inicializ�l�sa nem siker�lt"
 #~ msgstr "Levelez�s be�ll�t�sa"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Lev�l _nyomtat�sa"
-
-#, fuzzy
 #~ msgid "_VFolder on Subject"
 #~ msgstr "VMappa a t�m�ra"
 
diff --git a/po/it.po b/po/it.po
index 911e7ea92c..2f9d678077 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-03-13 12:27+01:00\n"
 "Last-Translator: Clara Tattoni  <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Importa i file VCard in Evolution."
 msgid "File As"
 msgstr "Memorizza Come"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
@@ -342,46 +342,46 @@ msgstr "VCard per %s"
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Errore nel criterio di ricerca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Aggiunta di una card al server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Rimozione di una card dal server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modifica di una card nel server LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Riavvio della ricerca in corso."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Ricezione dei risultati della ricerca LDAP in corso..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Errore nella rimozione di una card"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Impossibile interpretare URL `%s'"
@@ -472,11 +472,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contatti"
 
@@ -492,22 +492,31 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP contenente le informazioni dei contatti"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nuovo Contatto"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Contatti"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Crea un nuovo contatto"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nuova Lista di Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Lista dei _Contatti"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nuovo Contatto"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Contatti"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Crea una nuova lista di contatti"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -530,30 +539,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL non � supportato in questa compilazione di Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Impossibile inizializzare gnome-vfs"
 
@@ -561,11 +570,11 @@ msgstr "Impossibile inizializzare gnome-vfs"
 msgid "Other Contacts"
 msgstr "Altri Contatti"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -575,7 +584,7 @@ msgstr ""
 "che � stata inserita una URI errata,\n"
 "oppure che il server LDAP non funziona"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -587,7 +596,7 @@ msgstr ""
 "bisogna compilare il programma dai sorgenti CVS dopo\n"
 "aver scaricato Open LDAP dal link sottostante.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -595,44 +604,44 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che \n"
 "il percorso esista e che si abbia il permesso di accedervi."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Digitare la password per %s (utente %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "finisce per"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "La categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avanzato..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualunque Categoria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -754,7 +763,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Sorgenti della Rubrica"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -851,8 +860,8 @@ msgstr "Configurazione"
 msgid "Mappings"
 msgstr "Margini"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_ogni"
@@ -906,8 +915,8 @@ msgstr "_Scopo della Ricerca:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Ricerca in corso"
 
@@ -1105,15 +1114,15 @@ msgid "Using email address"
 msgstr "Indirizzo Email"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Aggiungi"
 
@@ -1160,12 +1169,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Modifica"
@@ -1281,10 +1290,10 @@ msgstr "Fabbrica per l'interfaccia di selezione dei nomi della Rubrica"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -1313,45 +1322,15 @@ msgstr "(%d non mostrati)"
 msgid "Unnamed Contact"
 msgstr "Contatto senza nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Seleziona Contatti dalla Rubrica"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Il mittente contiene"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution non � in grado di prendere l'archivio locale della rubrica.\n"
-"Questo fatto potrebbe essere stato causato da un crash del componente\n"
-"della rubrica di evolution.\n"
-"Per aiutarci a comprendere meglio ed infine risolvere il problema,\n"
-"per favore inviare una email a Jon Trowbridge <trow@ximian.com>\n"
-"con una descrizione dettagliata delle circostanze nelle quali questo "
-"errore \n"
-"si � verificato. Grazie"
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution non � in grado di prendere l'archivio locale della rubrica.\n"
-"In circostanze normali non dovrebbe mai accadere.\n"
-"Potrebbe essere necessario chiudere e riavviare Evolution per\n"
-"correggere il problema."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Seleziona Contatti dalla Rubrica"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Seleziona Nomi"
@@ -1373,15 +1352,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Sposta..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Cartella"
 
@@ -1486,11 +1460,12 @@ msgstr "Vuole ricevere messaggi in _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Elimina"
 
@@ -2725,7 +2700,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Nascondi gli indirizzi quando si invia una email a questa lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Rimuovere"
 
@@ -2788,7 +2763,7 @@ msgstr ""
 " gi� in questa cartella. Aggiungere comunque?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Ricerca Avanzata"
 
@@ -2816,21 +2791,21 @@ msgid "Error getting book view"
 msgstr "Errore nell'avvio di %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Errore nella modifica della card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Completato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2838,8 +2813,8 @@ msgstr "Errore sconosciuto"
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -2856,7 +2831,7 @@ msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2879,46 +2854,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Il file %s non esiste"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere la lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Errore nell'aggiungere una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Errore nella modifica della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Errore nella rimozione della lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Errore nella rimozione di una card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Mostra Card?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Mostra Card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2929,22 +2909,22 @@ msgstr ""
 "d nuove finestre\n"
 "sullo schermo. Si desidera veramente visualizzare tutte queste card?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nessuna card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nessuna card"
@@ -3017,7 +2997,7 @@ msgstr "Rubrica"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
@@ -3057,7 +3037,7 @@ msgid "Pilot Settings..."
 msgstr "Impostazioni _Pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contatto Precedente"
 
@@ -3066,8 +3046,8 @@ msgid "Send Message to Contact"
 msgstr "Invia un Messaggio al Contatto"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Stampa"
@@ -3087,7 +3067,7 @@ msgid "Move to folder..."
 msgstr "_Sposta nella Cartella..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Taglia"
 
@@ -3098,20 +3078,20 @@ msgid "Copy"
 msgstr "Copia"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Incolla"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Elimina"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Vista _Corrente"
@@ -3276,7 +3256,7 @@ msgstr "Margini"
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3366,26 +3346,26 @@ msgstr "Appuntamento senza titolo"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Altezza"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normale"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Basso"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Non definito"
@@ -3509,11 +3489,11 @@ msgstr "Suoneria (minuti)"
 msgid "_Edit appointment"
 msgstr "_Modifica appuntamenti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3525,13 +3505,13 @@ msgstr ""
 "richiede l'invio di un messaggio di posta elettronica.  Per questo,\n"
 "Evolution visualizzer� invece un messaggio a video."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Attenzine"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3548,7 +3528,7 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere pi� su questo programma in futuro."
 
@@ -3577,7 +3557,7 @@ msgstr "La descrizione contiene"
 msgid "Comment contains"
 msgstr "Il commento contiene"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
@@ -3588,7 +3568,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3610,19 +3590,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Impossibile creare la vista del calendario.  Controllare le impostazioni di "
 "ORBit e di OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privato"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidenziale"
@@ -3647,37 +3627,37 @@ msgstr "E"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Libero"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Occupato"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In corso"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Completato"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3688,56 +3668,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Nessuno "
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Ricorre"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "S�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "No"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Vista Giornaliera"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Vista della Settimana Lavorativa"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vista Settimanale"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Vista Mensile"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Calendario"
 
@@ -3745,12 +3724,12 @@ msgstr "Calendario"
 msgid "Folder containing appointments and events"
 msgstr "Cartella contenente appuntamenti ed eventi"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Attivit�"
 
@@ -3758,39 +3737,56 @@ msgstr "Attivit�"
 msgid "Folder containing to-do items"
 msgstr "Cartella contente le cose da fare"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nuovo appuntamento"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Appuntamento"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Crea un nuovo appuntamento"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Riunione"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Crea una nuova richiesta di apppuntamento"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nuova attivit�"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Attivit�"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Crea una nuova attivit�"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nuovo appuntamento"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Appuntamento"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nuovo appuntamento"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Appuntamento"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Crea un nuovo appuntamento"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3859,7 +3855,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Con questi argomenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "giorni"
 
@@ -3867,11 +3864,13 @@ msgstr "giorni"
 msgid "extra times every"
 msgstr "tempo in pi� ogni"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "Ore"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuti"
 
@@ -3999,7 +3998,7 @@ msgstr "Promemoria"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Indice:"
 
@@ -4028,7 +4027,7 @@ msgstr "termine dell'appuntamento"
 msgid "hour(s)"
 msgstr "Ora (e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuto(i)"
 
@@ -4206,7 +4205,7 @@ msgid "_Fri"
 msgstr "_Ven"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Generale"
 
@@ -4251,19 +4250,33 @@ msgstr "_Mer"
 msgid "before every appointment"
 msgstr "prima dell'inizio di un appuntamento"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Lo stato della riunione � cambiato.  Inviare una versione aggiornata?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sicuro di voler annullare e cancellare questo appuntamento?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sei sicuro di voler annullare e cancellare questa attivit�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sei sicuro di voler annullare e cancellare questa voce dell'agenda?"
 
@@ -4335,61 +4348,61 @@ msgstr " (Scadenza "
 msgid "Due "
 msgstr "Scadenza "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'elemento!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Attivit� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce nell'agenda - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nessuna descrizione"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Impossibile ottenere la versione corrente!"
 
@@ -4588,7 +4601,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4600,7 +4613,7 @@ msgstr "Ruolo"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stato"
@@ -4686,7 +4699,7 @@ msgstr "il"
 msgid "first"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "secondo"
 
@@ -4710,7 +4723,7 @@ msgstr "lista"
 msgid "Other Date"
 msgstr "Altro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "giorno"
 
@@ -4812,20 +4825,26 @@ msgstr "% Completato"
 msgid "Date Completed:"
 msgstr "Completato in data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Richiede Azione"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "In corso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Priorit�:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stato:"
 
@@ -4839,7 +4858,7 @@ msgstr "Di base"
 msgid "Assignment"
 msgstr "Assegnato"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4908,80 +4927,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Apri"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salva come..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Taglia"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copia"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Assegna Attivit�"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Inoltra come i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marka Attivit� Come Complete"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Elimina le Attivit� Selezionate"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Fare clic qui per aggiungere un'attivit�"
@@ -4990,8 +5009,8 @@ msgstr "Fare clic qui per aggiungere un'attivit�"
 msgid "Alarms"
 msgstr "Avvisi Sonoro"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Completato"
 
@@ -5019,11 +5038,9 @@ msgstr "Priorit�"
 msgid "Start Date"
 msgstr "Inizio"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Sommario"
 
@@ -5065,111 +5082,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nuovo _Appuntamento"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nuovo _Evento del Giorno"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nuova Attivit�"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Stampa..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Vai a _Oggi"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Rende note le Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura %s"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configura %s"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salva con Nome..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Pianifica una _Riunione"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Inoltra come i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "_Rendi rimandabile questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa Ricorrenza"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Elimina _Tutte le Ricorrenze"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "I tool di GNOME Pilot non sembrano essere installati in questo sistema."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'esecuzione di %s."
@@ -5210,7 +5226,7 @@ msgstr "Attivit� Completata: <b>"
 msgid "Task Due: <b>"
 msgstr "Attivit� Da Completare Entro: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Informazioni iCalendar"
 
@@ -5219,335 +5235,340 @@ msgstr "Informazioni iCalendar"
 msgid "iCalendar Error"
 msgstr "Errore iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Partecipante sconosciuto"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Controllate queste informazioni, e poi selezionate un'azione dal menu."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Nessuno</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Posizione _Geografica:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Stato:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Accettata"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Accettato con tentativo"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Annullato"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Specificare un'operazione:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Aggiornare"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Accettare"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Accettare con tentativo"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Rifiutare"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Invia Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Aggiorna stato risposta"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Invia Informazioni Correnti"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annulla"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha pubblicato informazioni riguardo una riunione."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Dettagli della Riunione"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> richiede la tua presenza ad una riunione."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Proposta di Riunione"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vuole aggiungersi ad una riunione esistente."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Aggiornamento Riunione"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sulla riunione."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Richiesta di Aggiornamento sulla Riunione"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha risposto ad una richiesta di riunione."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Risposta ad una Riunione"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha annullato una riunione."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Annullamento Riunione"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha mandato un messaggio indecifrabile."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Messaggio di Richiesta Riunione Non Valido"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha pubblicato informazioni sulle proprie attivit�."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informazioni sull'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ha richiesto che venga eseguito un compito."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Proposta di Attivit�"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vuole aggiungere informazioni ad una attivit� esistente."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Aggiornamento Attivit�"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vuole ricevere informazioni aggiornate sull'attivit�."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Richiesta di Aggiornamento dell'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha risposto all'assegnamento di un compito."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Risposta all'Attivit�"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha annullato un'attivit�."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Annullamento Attivit�"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Messaggio di Attivit� Indecifrabile"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha pubblicato informazioni sulla disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informazioni sulla Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> richiede informazioni sulla disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Richiesta Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha risposto a una richiesta di disponibilit�."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Risposta Disponibilit�"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Messaggio di Disponibilit� Indecifrabile"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Il messaggio contiene solo richieste di tipo non supportato."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "L'allegato non contiene un messaggio di calendario valido"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "L'allegato non ha nessun elemento di calendario visibile"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Si � verificato un errore nella ricezione dei dati da"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Aggiornamento completato\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Impossibile aggiornare il file di calendario!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante; l'elemento non esiste pi�"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Impossibile aggiornare lo stato del partecipante; lo stato non � valido!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Stato del partecipante aggiornato\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossibile aggiornare lo stato del partecipante!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Rimozione Completata"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Elemento Spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "L'elemento non pu� essere spedito!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Scegli Cartella"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Scegli Cartella"
@@ -5593,7 +5614,7 @@ msgstr "inizio"
 msgid "Chair Persons"
 msgstr "Moderatori"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Partecipanti Richiesti"
 
@@ -5606,57 +5627,52 @@ msgid "Non-Participants"
 msgstr "Non Partecipanti"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuale"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Gruppo"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Risorse"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Stanza"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Moderatore"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Partecipante Richiesto"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Partecipante Opzionale"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Non Partecipante"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Richiede Azione"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativo"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegato"
 
@@ -5746,48 +5762,45 @@ msgstr "_Inizio appuntamento ore:"
 msgid "Meeting _end time:"
 msgstr "T_ermine dell' appuntamento ore:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura attivit� %s in corso"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Impossibile caricare le attivit� in `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Il metodo richiesto per caricare `%s' non � supportato"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Impossibile aprire la cartella in `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Ultimato il"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Rimozione degli elementi selezionati in corso"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Eliminazione"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nuovo _Appuntamento..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Elimina questo Appuntamento"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5798,11 +5811,16 @@ msgstr "Impossibile aprire la cartella in `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Il metodo richiesto per aprire `%s' non � supportato"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Apertura calendario %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Lettura cartella %s in corso"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprile"
@@ -5859,53 +5877,58 @@ msgstr "Ottobre"
 msgid "September"
 msgstr "Settembre"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "� richiesto almeno un partecipante"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "� necessario impostare un organizer."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Informazioni sul calendario"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informazioni sull'attivit�"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informazioni di Diario"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Informazioni sulla disponibilit�"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informazioni di calendario"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Aggiornare"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Aggiorna Lista"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Devi essere un partecipante all'evento."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Impossibile inizializzare Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Impossibile creare la fabbrica per l'editor dei componenti"
 
@@ -6132,9 +6155,8 @@ msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Anteprima di Stampa"
 
@@ -6170,8 +6192,8 @@ msgstr ""
 "\n"
 "Cancellare comunque queste attivit�?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Non chiedere pi� in futuro."
 
@@ -6234,17 +6256,29 @@ msgstr "Importa i file iCalendar in Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa i file VCalendar in Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Impossibile prendere il messaggio: %s dalla cartella: %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Impossibile connettersi allo store: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Promemoria"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Messaggio del Calendario"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6253,84 +6287,84 @@ msgstr ""
 "Evolution ha trovato file di posta Pine.\n"
 "Si desidera importarli in Evolution"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Calendario"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now prevede 0 argomenti"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time prevede 1 argomento"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time prevede che l'argomento 1 sia una stringa ISO 8601 data/ora"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day prevede 2 argomenti"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day prevede che l'argomento 1 sia un intero"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin prevede 1 argomento"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end prevede 1 argomento"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype prevede 0 argomenti"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? prevede che l'argomento 1 sia un time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? prevede che l'argomento 2 sia un time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contiene? prevede 2 argomenti"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contiene? prevede che l'argomento 1 sia una stringa"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contiene? prevede che l'argomento 2 sia una stringa"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6338,11 +6372,11 @@ msgstr ""
 "contiene? prevede che l'argomento 1 sia \"qualsiasi\", \"sommario\", "
 "\"descrizione\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "ha categorie? prevede almeno 1 argomento"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6350,19 +6384,19 @@ msgstr ""
 "has-categories? prevede che tutti gli argomenti siano stringhe e che uno "
 "solo sia falso (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? non vuole nessun argomento"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? vuole un solo argomento"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? richiede che il primo argomento sia di tipo time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "La valutazione dell'espressione di ricerca non ha restituito un valore "
@@ -7961,71 +7995,81 @@ msgstr "Archiviazione cartella '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "� necessario essere collegati per completare questa operazione"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sincronizzazione cartelle"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errore nel filtro di smistamento: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errore nell'esecuzione del filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Impossibile aprire la cartella per lo spool"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Impossibile operare sulla cartella per lo spool"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ricezione del messaggio %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Impossibile aprire il messaggio"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Errore al messaggio %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sincronizzazione cartella"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Ricezione messaggio %d di %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Errore di ricazione del messaggio"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Argomenti non validi"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Argomenti non validi"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errore nell'esecuzione della ricerca con filtro: %s: %s"
@@ -8083,7 +8127,7 @@ msgstr "Trasferimento dei messaggi in corso"
 msgid "Copying messages"
 msgstr "Copia messaggi in %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8091,47 +8135,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "� necessario fornire un nome di file."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare questo messaggio: mancano i destinatari"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8139,18 +8183,18 @@ msgid ""
 "%.*s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Decodifica messaggio non riuscita."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8178,24 +8222,24 @@ msgid "Could not lock '%s'"
 msgstr "Impossibile bloccare '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Impossibile creare il file di blocco per %s; %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Tempo scaduto nel tentativo di prendere il file di lock %s.  Riprovare pi� "
 "tardi."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Rimozione del lock usando fcntl(2) non riuscita: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Rimozione del lock usando flock(2) non riuscita: %s"
@@ -8254,11 +8298,16 @@ msgstr "Errore nella scrittura del file temp di posta: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Errore nella copia del file temp di posta: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Impossibile decifrare: motivo sconosciuto"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Impossibile decifrare: motivo sconosciuto"
@@ -8391,7 +8440,7 @@ msgstr ""
 " %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Cattiva risposta di autenticazione dal server."
 
@@ -8569,32 +8618,134 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: Operazione non supportata in questo store"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Verifica certificati non riuscita."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Mittente: %s\n"
-"Oggetto: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Verifica certificati non riuscita."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Certificato non corretto da %s:\n"
-"\n"
-"%s\n"
-"Accettare comunque?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "File con la firma:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID del _Certificato:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Errore nel caricare: %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Assente"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Verifica certificati non riuscita."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID del _Certificato:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argomento non valido"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID del _Certificato:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID del _Certificato:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8607,16 +8758,32 @@ msgstr ""
 "Impronta digitale:    %s\n"
 "Firma:                %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "BENE"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "MALE"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Certificato non corretto da %s:\n"
+"\n"
+"%s\n"
+"Accettare comunque?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8635,32 +8802,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Impossibile interpretare URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Errore nell'avvio di %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non � presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: Operazione non valida"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: Cartella inesistente"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossibile rinominare la cartella %s: Operazione non valida"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
@@ -8668,12 +8840,12 @@ msgstr "Impossibile rinominare la cartella %s: Cartella inesistente"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si � disconnesso inaspettatamente: %s"
@@ -8702,40 +8874,40 @@ msgstr "La risposta del server IMAP non contiene informazione %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare il sommario di %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Questo messaggio non � al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -8744,10 +8916,10 @@ msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Impossibile aprire la directory cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Impossibile salvare messaggio %s nella cache: %s"
@@ -8760,7 +8932,7 @@ msgstr "Controllo nuova posta"
 msgid "Check for new messages in all folders"
 msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Cartelle"
 
@@ -8790,7 +8962,7 @@ msgstr "Per leggere e memorizzare la posta su server IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Password"
 
@@ -8800,73 +8972,77 @@ msgstr ""
 "Con questa opzione ci si connette al server IMAP usando una password di "
 "testo semplice."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Connessione annullata"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operazione non supportata"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autenticazione fallita"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "La cartella non � vuota"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, 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:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Non � stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8877,31 +9053,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Non � presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Il nome di una cartella non pu� contenere il carattere Invio."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non � permesso contenere sottocartelle"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8923,7 +9105,10 @@ msgid "Local delivery"
 msgstr "Consegne locali"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Per ricevere la posta locale da mbox formato standard."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8951,12 +9136,12 @@ msgstr "Spool standard Unix"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Per leggere e memorizzare la posta in file standard mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8967,38 +9152,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Impossibile cancellare il file indice della cartella `%s': %s"
@@ -9059,7 +9244,7 @@ msgstr ""
 "%s "
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9097,26 +9282,26 @@ msgstr "non � una directory maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Impossibile esaminare la cartella `%s':%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Impossibile aprire il percorso della directory maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Controllo nuova posta"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Ricerca nuovi messaggi"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Salvataggio della cartella in corso"
@@ -9160,7 +9345,7 @@ msgstr "La cartella appare irrimediabilmente corrotta."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9169,7 +9354,7 @@ msgstr ""
 "Impossibile il file %s:\n"
 "%s "
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9178,14 +9363,14 @@ msgstr ""
 "Impossibile creare il file `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non � un file regolare."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9194,7 +9379,7 @@ msgstr ""
 "Impossibile cancellare la cartella `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non � vuota.  Non cancellata."
@@ -9211,65 +9396,65 @@ msgstr ""
 "Errore fatale di simistamento della posta vicino alla posizione %ld nella "
 "cartella %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Impossibile controllare la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Impossibile aprire il file: %s: %s "
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
@@ -9419,47 +9604,47 @@ msgstr "Usa annulla"
 msgid "Operation failed: %s"
 msgstr "Operazione non riuscita: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Ricezione indice POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Utente cancellato"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Impossibile avere il sommario POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Rimozione messaggi sul server in corso"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nessun messaggio con uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Ricezione messaggio POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Impossibile prendere il messaggio: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -9476,7 +9661,7 @@ msgstr "Lasciare i messaggi sul server"
 msgid "Delete after %s day(s)"
 msgstr "Elimina dopo %s giorno(i)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9502,6 +9687,11 @@ msgstr ""
 "attraverso il protocollo APOP.  Potrebbe non funzionare per tutti gli utenti "
 "anche su server che affermano di supportarlo. "
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Impossibile connettersi a %s (porta %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9513,54 +9703,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Impossibile connettersi al server POP su %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non � presente il supporto per il meccaniscmo di autenticazione richiesto."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login fallito: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "Errore del protocollo SASL"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "Errore I/O: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"Non in grado di autenticare al server IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPrego inserire la password del POP per %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9587,35 +9782,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Impossibile effettuare fork di sendmail: %s: posta non inviata"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminato con il segnale %s: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Impossibile eseguire %s: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminato con valore di ritorno %d: posta non inviata."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9727,45 +9922,45 @@ msgstr "Autenticazione temporaneamente non riuscita"
 msgid "Authentication required"
 msgstr "Autenticazione richiesta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Errore nella risposta di QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Il messaggio non sembra avere un formato valido"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Errore nella risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sInserire la password SMTP per %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9776,89 +9971,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Posta SMTP consegnata attraverso il programma %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Invio messaggio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossibile inviare il messaggio: senza destinatari."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Impossibile inviare il messaggio: uno o pi� destinatari non validi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Saluti SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Richiesta di HELO scaduta: %s: non fatale"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Richiesta RSET scaduta: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Errore nella risposta di RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Autenticazione SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Errore nel creare un oggetto di autenticazione SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Richiesta AUTH non riuscita"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Cattiva risposta di autenticazione dal server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Richiesta MAIL FROM scaduta: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "Errore nella risposta MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "La richiesta di RCPT TO: %s: posta non inviata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> non riuscito"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
@@ -9866,88 +10061,88 @@ msgstr "RIchiesta di DATA scaduta: %s: posta non inviata."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Errore nella risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA ha inviato il segnale di tempo scaduto: terminazione del messaggio: %s "
 "posta non inviata."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "Errore di risposta di DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Richiesta RSET scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "Errore nella risposta di RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Richiesta QUIT scaduta: %s: non fatale"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Richiesta AUTH scaduta: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "Errore nella risposta di QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Impossibile allegare il file %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Impossibile allegare il file %s: non � un file regolare"
@@ -9965,57 +10160,61 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Consiglio visualizzazione automatica degli allegati"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Cliccare qui per la rubrica"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Da:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Rispondi-a:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Da:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10023,17 +10222,25 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Impossibile creare un contesto per la firma PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10042,34 +10249,34 @@ msgstr ""
 "Errore di lettura del file: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Il file esiste, sovrascriverlo?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errore di accesso al file: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Impossibile scaricare messaggi dall'editor"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10078,7 +10285,7 @@ msgstr ""
 "Impossibile cercare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10087,7 +10294,7 @@ msgstr ""
 "Impossibile troncare il file: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10096,7 +10303,7 @@ msgstr ""
 "Errore nel salvataggio automatico del messaggio: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10105,7 +10312,7 @@ msgstr ""
 "precedente.\n"
 "Si desidera tentare di recuperarli?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10115,43 +10322,39 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Inserici File"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Salva firma"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (predefinito)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10159,7 +10362,7 @@ msgstr ""
 "Impossibile creare una finestra di composizione:\n"
 "impossibile attivare il controllo del selettore di indirizzi."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10167,9 +10370,9 @@ msgstr ""
 "Impossibile creare la finestra di composizione:\n"
 "Il componente HTML non � disponibile."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10233,8 +10436,8 @@ msgstr "L'oggetto contiene"
 msgid "Subject does not contain"
 msgstr "L'oggetto non contiene"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10242,12 +10445,11 @@ msgstr ""
 "Esiste gi� un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Ricorda questa password"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Ricorda questa password per il resto della sessione"
 
@@ -10345,150 +10547,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "anno"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "anni"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " secondi"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mese"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "Minuto"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mesi"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "Ora"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "settimana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "settimane"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "Ora"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mese"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "Minuto"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mesi"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr " secondi"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "anno"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "anni"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "La data non � stata specificata."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "La data specificata non � valida."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"La data del messaggio verr� confrontata\n"
-"con la data di avvio del filtro o di apertura\n"
-"del vfolder, qualunque essa sia"
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"La data del messaggio verr� confrontata\n"
-"con quella specificata qui."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"La data del messaggio verr� confrontata\n"
-"con una data relativa all'avvio del filtro;\n"
-"\"una settimana fa\", ad esempio."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "L'ora corrente"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "una data specifica"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "una data relativa a quellla corrente"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Scegliere un tempo da confrontare"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Confronta con"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<clicca qui per selezionare una data>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "adesso"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " fa"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "fa"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " fa"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<clicca qui per selezionare una data>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Scegliere un tempo da confrontare"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Specifica nome del file:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' non esiste oppure non � un file regolare."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Specificare un'operazione:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Di"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Aggiungi Azione"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10497,12 +10649,12 @@ msgstr ""
 "� necessario specificare una cartella valida per la memorizzazione della "
 "posta."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10511,92 +10663,168 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "dopo"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "� necessario assegnare un nome a questo filtro."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se qualche criterio � soddisfatto"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "in entrata"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "in uscita"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Confronta con"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Modifica VFolder"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "In entrata"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "In uscita"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La data del messaggio verr� confrontata\n"
+"con quella specificata qui."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La data del messaggio verr� confrontata\n"
+"con una data relativa all'avvio del filtro;\n"
+"\"una settimana fa\", ad esempio."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La data del messaggio verr� confrontata\n"
+"con quella specificata qui."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Cartelle Virtuali"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "una data relativa a quellla corrente"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "fa"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "solo le cartelle specificate"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "L'ora corrente"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "una data specifica"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Sorgenti delle Cartelle Virtuali"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "tutte le cartelle remote attive"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "tutte le cartelle locali e remote attive"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "tutte le cartelle locali"
 
@@ -10624,42 +10852,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Ditta"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "non contiene"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "non finisce con"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "non esiste"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "non esiste"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "non assomiglia a"
@@ -10681,89 +10909,85 @@ msgid "ends with"
 msgstr "finisce per"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Esegui un comado della shell"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Esistente"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "esiste"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Importante"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "� dopo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "� prima"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "� segnato"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maggiore di"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� minore di"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "non �"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "non � segnato"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailing list"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Esegui un comado della shell"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Emetti un suono:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Leggi"
 
@@ -10779,57 +11003,87 @@ msgstr "Corrispindenza con l'espressione regolare"
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "� maggiore di"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "� minore di"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punteggio"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Imposta _Stato"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Esegui un comado della shell"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Dimensione (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "Assomiglia a"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Account Sorgente"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "comincia per"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Oggetto"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Imposta _Stato"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regole"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Aggiungi Regola"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Modifica Regola"
 
@@ -10837,11 +11091,11 @@ msgstr "Modifica Regola"
 msgid "Score Rules"
 msgstr "Regole di punteggio"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "� necessario assegnare un nome a questa vfolder."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "� necessario specificare almeno una cartella come sorgente."
 
@@ -10849,31 +11103,31 @@ msgstr "� necessario specificare almeno una cartella come sorgente."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importazione in Corso..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Attendere prego"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importazione di %s come %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Scansione di \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Posta"
 
@@ -10934,39 +11188,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sta importando i vecchi dati di Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Cestino"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "File di posta locale: %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Scansione cartella"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Inizio importazione"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Modifica Filtri"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11048,12 +11302,12 @@ msgstr "Fabbrica per il componente del Sommario della Posta"
 msgid "Font Preferences"
 msgstr "_Nessuna Ricorrenza"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Account"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11101,7 +11355,7 @@ msgstr "Propriet�..."
 msgid "Change this folder's properties"
 msgstr "Modifica le propriet� dei questa cartella"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11109,60 +11363,80 @@ msgstr ""
 "Alcune delle impostazioni della posta sembrano essere state corrotte, "
 "controllare che tutto sia a posto."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Non � stato impostato un sistema di trasporto per la posta"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Attenzione: Messaggio Modificato"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nuovo Messaggio di Posta"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Invia _Messaggio"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Componi un nuovo messaggio"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Nuovo Messaggio"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Messaggio Precedente"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nuovo Messaggio di Posta"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "Impossibile attivare il componente di configurazione della posta di "
 "Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Impossibile attivare il componente folder info di Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Connessione al server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Impossibile attivare lo storage nella shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet� per \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propriet�"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
@@ -11212,135 +11486,135 @@ msgstr "%d totali"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea una Cartella _Virtuale dal Messaggio"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Cartella Virtuale sull'_Oggetto"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Cartella Virtuale sul _Mittente"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Cartella Virtuale sui _Destinatari"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Cartella Virtuale sulla Mailing _List"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_Oggetto"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _Mittente"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _Destinatari"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _Mailng List"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Modifica come Nuovo Messaggio..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Rispondi al Mittente"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Rispondi alla _Lista"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completato"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Annulla"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Segna come _Letto"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Segna come _Non Letto"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Segna come _Importante"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Segna come _Nonimportante"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copia nella Cartella..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi Mittente alla _Rubrica"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crea Rego_la dal Messaggio"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Cartella Virtuale sulla Mailng List"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Cartella Virtuale sulla Mailng List (%s)"
@@ -11404,76 +11678,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor dlle News di Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor degli Account di Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Username:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Percorso:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "� possibile creare due account con lo stesso nome."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Sicuro di voler cancellare questo account?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Non cancellare"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Cancellare veramente questo account?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Disabilita"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Abilita"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Sicuro di voler cancellare questo aaccount delle news?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome dell' _Account:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
@@ -11483,30 +11748,30 @@ msgstr "Porto Rico"
 msgid "Mail to %s"
 msgstr "Mail a %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Oggetto � %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail da %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11518,7 +11783,7 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11530,7 +11795,7 @@ msgstr ""
 "ricevere o scrivere posta.\n"
 "Si desidera configurarlo subito?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11538,7 +11803,7 @@ msgstr ""
 "� necessario configurare un' identit�\n"
 "prima di poter comporre una email."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11547,7 +11812,7 @@ msgstr ""
 "della posta prima di comporla."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11555,11 +11820,11 @@ msgstr ""
 "Il messaggio � in HTML, ma i seguenti destinatari non vogliono ricevere "
 "posta HTML:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Inviare comunque?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11567,7 +11832,7 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11576,11 +11841,11 @@ msgstr ""
 "per nascondere gli indirizzi della lista, questo messaggio contiene solo "
 "destinatari Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Questo messaggio contiene solo destinatari Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11590,16 +11855,11 @@ msgstr ""
 "header simile ad A.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "� necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"� necessario configurare un' identit� prima di poter inviare questa email."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11607,28 +11867,28 @@ msgstr ""
 "Impossibile apreire la cartella delle bozze per questo account.\n"
 "Usare la cartella delle bozze predefinita?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Il %a, %Y-%m-%d alle %H:%M, %%s ha scritto:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sei sicuro di voler modificare tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11636,7 +11896,7 @@ msgstr ""
 "� possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11644,39 +11904,39 @@ msgstr ""
 "� possibile reinviare solo i messaggi\n"
 "salvati nella cartella Posta Inviata."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sei sicuro di voler rispedire tutti i %d messaggi?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Nessun Messaggio Selezionato"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Mostra il prossimo messaggio non letto"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11689,7 +11949,7 @@ msgstr ""
 "\n"
 "Cancellare comunque questi messaggi?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11698,28 +11958,28 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "Lettera-USA"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Sicuro di voler aprire tutti i %d messaggi in finestre separate?"
@@ -11740,7 +12000,7 @@ msgstr "Nessuna descrizione disponibile"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contatto senza nome"
@@ -11761,20 +12021,21 @@ msgid "Add Signature"
 msgstr "Salva firma"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Inserire nome e indirizzo email qui sotto. Non � necessario riempire i campi "
 "\"opzionali\",\n"
 "a meno che non si desideri includere queste informazioni alle email spedite."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Inserire qui sotto le informazioni riguardanti il server di posta in "
 "entrata. Se non si � sicuri, chiedere\n"
@@ -11785,24 +12046,23 @@ msgid "Please select among the following options"
 msgstr "Selezionare una delle seguenti opzioni"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Inserire qui sotto le informazioni riguardanti le modalit� di invio della "
 "posta. Se non si � sicuri, chiedere\\n\"\n"
 "\"all'amministratore di sistema o al Provider."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "La co9nfigurazione della posta � quasi terminata. L'identit�, il server di "
 "posta in entrata\n"
@@ -11813,44 +12073,20 @@ msgstr ""
 "Questo nome � usato solo allo scopo di visualizzare."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Guida agli Account di Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "dopo"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Verifica Servizi"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
@@ -12112,237 +12348,225 @@ msgstr "Salva ed Esci"
 msgid "Loading Images"
 msgstr "Carica _Immagini"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Collocazione della Mailbox"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Header del messaggio"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Visualizzazione _Messaggio"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notifica Nuova Posta"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Notiziari"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informazioni Opzionali"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zzazione:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "ID della _chiave PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Scegliere un colore"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Stampa i contatti selezionati"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Impossibile aprire il messaggio"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citato"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Ri_corda questa password"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Rispondi-a:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Ricezione Email"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opzioni di Ricezione"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Ricorda questa password"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Informazioni Richieste"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Predefiniti"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Sicurezza"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME sicuro (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Scegliere un file binario PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Invio Email"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Cartella _messaggi inviati:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Messaggi Inviati e Bozze"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Il ser_ver richiede autenticazione"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurazione del Server"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Tipo di Server:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Collegamenti"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Salva firma"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Salva firma"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Sorgente"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informazione Sorgenti"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Specifica nome del file:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Mbox standard per Unix"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12352,207 +12576,203 @@ msgstr ""
 "\n"
 "Cliccare \"successivo\" per cominciare."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Caricare sempre le immagini dalla rete"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "Tipo di _Autenticazione: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Controlla la posta _automaticamente"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Emetti un suono quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID del _Certificato:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Chiedi conferma prima di eliminare definitivamente i messaggi"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Firma _HTML:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Predefiniti"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Non notificare l'arrivo di nuova posta"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Abilita"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "_Inoltra Messaggio"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Nome e cognome:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Posta HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identit�"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carica le immagini se il mittente � nella rubrica"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Imposta come mio account _predefinito"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Segna i _messaggi come letti dopo"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Non caricare mai le immagini dalla rete"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Percorso binario di _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Suona un file sonoro quando arriva nuova posta"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Chiedere conferma prima di inviare messaggi HTML a contatti che non li "
 "desiderano"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Segnala l'invio di messaggi _senza oggetto."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Rispondi a Tutti"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sicurezza"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Invio Posta"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Mostra ora come"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_File con la firma:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usa conn_essione sicura (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabile"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_ogni"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " colore"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "descrizione"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12576,204 +12796,214 @@ msgstr "Imposssibile creare un contesto per la busta S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Impossibile creare un contesto di codifica  S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Salva su Disco..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Salva Allegati"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Carica _Immagini"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Caricamento del contenuto del messaggio"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Attivit� scadute:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Aprei il link nel Browser"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copia la collocazione del Link"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Salva il Link come"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Salva Immagine con nome..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Indirizzo errato"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Da"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Rispondi-a"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "A"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Posta"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Salva Messaggio con nome..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Questo messaggio ha una firma digitale.  Fare click sull'icona per avere "
 "ulteriori informazioni."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Impossibile creare un contesto per la verifica PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Questo messaggio ha una firma digitale riscontrata come autentica."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Questo messaggio ha una firma digitale di cui non � possibile provare "
 "l'autenticit�."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformata."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Cartelle Locali"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Riconfigurazione cartella"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sar� pi� possibile riaprire questa cartella: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Impossibile salvarele metainfo della cartella %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Impossibile cancellare imetadati della cartella %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s pu� non essere stato riconfigurato perch� non � una cartella locale"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12781,16 +13011,16 @@ msgstr ""
 "Se non si riesce pi� ad aprire questa mailbox, pu� essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Non � possibile modificare il formato di una cartella non locale."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Riconfigura /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12799,7 +13029,7 @@ msgstr ""
 "Errore durante '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12808,7 +13038,7 @@ msgstr ""
 "Errore durante l'operazione:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Sto lavorando"
 
@@ -12816,100 +13046,100 @@ msgstr "Sto lavorando"
 msgid "Filtering Folder"
 msgstr "Filtraggio Cartella"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Ricezione Posta"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Tuttavia, il messaggio � stato inviato correttamente."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Invio del messaggio %d di %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Errore al messaggio %d di %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Completato."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Lettura store %s in corso"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Aggiornamento cartella"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Eliminazione cartella"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Scaricamento del messaggio %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Ricezione di %d messaggio(i)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvataggiodi %d messaggio(i)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12918,7 +13148,7 @@ msgstr ""
 "Impossibile creare il file di output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12927,11 +13157,11 @@ msgstr ""
 "Errore nel salvare i messaggi in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Salvataggio Allegati"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12940,27 +13170,22 @@ msgstr ""
 "Impossibile creare il file di output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnessione da %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Riconnessione a %s in corso"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Esecuzione di comando shell: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -13015,32 +13240,41 @@ msgstr "Percorso %s, Tipo: %s"
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Invia e Ricevi Posta"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Annulla Tutto"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Aggiornamento in corso..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "In Attesa..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Operazione annullata dall'utente."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Ricorda questa password"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Ricorda questa password per il resto della sessione"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la Password per %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Inserire la Password"
 
@@ -13067,7 +13301,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13097,7 +13331,7 @@ msgstr "Messaggio inoltrato - %s"
 msgid "Forwarded message"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Messaggio Inoltrato"
 
@@ -13111,7 +13345,7 @@ msgstr "Impostazione vfolder %s in corso"
 msgid "Updating vfolders for uri: %s"
 msgstr "Aggiornamento vfolder per %s in corso"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13124,94 +13358,97 @@ msgstr ""
 "    '%s'\n"
 "che ora � stata rimossa, e quindi sono state aggiornate."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFolder"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Modifica VFolder"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Si � cercato di editare una vfolder (%s) che non esiste."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(nessun oggetto)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Messaggio"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi Multipli Non Visti"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Messaggi Multipli"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Il pi� basso"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Pi� basso"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Pi� alto"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Il pi� alto"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Generazione lista messaggi"
 
@@ -13244,47 +13481,47 @@ msgstr "Ricevuta"
 msgid "Size"
 msgstr "Dimensione"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Vai avanti"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informazione Sorgenti"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Inoltra"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Anteprima"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13308,16 +13545,16 @@ msgstr "Sottoscrivere cartella \"%s\" "
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Cartella"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Nessun server � stato selezionato"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Selezionare un server."
 
@@ -17781,11 +18018,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Aeroporto"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23201,8 +23440,8 @@ msgstr "Nessuna descrizione disponibile"
 msgid "Mail summary"
 msgstr "Sommario della Posta"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Cartelle Locali"
 
@@ -23220,15 +23459,15 @@ msgstr "LIRU:LIML"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Parola del Giorno"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Citazione del Giorno"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Aggiungere un notiziario"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Aggiungere la URL del notiziario RDF che si vuole aggiungere"
 
@@ -23240,27 +23479,27 @@ msgstr "Errore scaricando il file RDF"
 msgid "News Feed"
 msgstr "Notiziario"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "A_ggiungi"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Nessuna attivit�"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Nessuna Descrizione Disponibile)"
 
@@ -24534,7 +24773,8 @@ msgid "Tasks "
 msgstr "Attivit� "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Impostazioni Meteo"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24591,7 +24831,7 @@ msgstr "Mostra Dettagli"
 msgid "Cancel Operation"
 msgstr "Annulla Operazione"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24605,20 +24845,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Come Cartella Inviati"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Bozze"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Posta in Arrivo"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Posta in Uscita"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Inviata"
 
@@ -24857,22 +25097,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Crea nuova cartella"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Il tipo di cartella selezionata non � valido\n"
-"per l'operazione richiesta. "
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crea _Nuova cartella..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nuovo..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
@@ -24894,7 +25127,7 @@ msgstr ""
 "Si pu� selezionare \"Automatico\" se non si conosce, Evolution tenter� di "
 "arrangiarsi."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Selezionare il tipo di informazioni che si desidera importare:"
 
@@ -24925,21 +25158,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Scegli Cartella"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Il file %s non esiste"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Errore in Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "I dati possono solo essere importati in cartelle locali"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24948,11 +25177,11 @@ msgstr ""
 "Non c'� un importatore adatto a gestire\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importazione"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24961,17 +25190,17 @@ msgstr ""
 "Importazione di %s.\n"
 "Avvio di %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Errore nell'avvio di %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Errore nel caricare: %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24980,31 +25209,31 @@ msgstr ""
 "Importazione %s\n"
 "Importazione dell'oggetto 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatico"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nome del file:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Scegliere un file"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tipo di file:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importa dati e impostazioni da altri programmi"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importa un file singolo"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25012,24 +25241,24 @@ msgstr ""
 "Attendere...\n"
 "Ricerca di impostazioni esistenti"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Avvio degli Importatori Intelligenti"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Da %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Selezionare una cartella destinazione per importare questi dati"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importa"
 
@@ -25077,9 +25306,14 @@ msgstr "Lettura cartella %s in corso"
 msgid "in \"%s\" ..."
 msgstr "Apri in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Impossibile rinominare la cartella: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Impossibile creare la cartella specificata:\n"
 "%s"
@@ -25097,8 +25331,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Impossibile avviare l'interfaccia Assistente Posta di Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nuovo"
@@ -25139,58 +25373,59 @@ msgstr "Vai alla Cartella..."
 msgid "Select the folder that you want to open"
 msgstr "Selezionare la cartella che si desidera aprire"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Crea un nuovo collegamento"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selezionare la cartella a cui si vuole che punti il collegamento:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Lavora Connesso"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Lavora Disconnesso"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Non connesso"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Nessuno)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution � al momento connesso.  Cliccare questo bottone per "
 "disconnettersi."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution si sta disconnettendo."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution � al momento disconnesso.  Cliccare questo bottone per "
 "connettersi."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25202,12 +25437,12 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25218,31 +25453,31 @@ msgstr ""
 "� inaspettatamente terminato. Sar� necessario uscire e riavviare\n"
 "Evolution prima di poter accedere nuovamente a questi dati."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Argomenti non validi"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Impossibile registrare OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Database di Configurazione non trovato"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento "
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nome del Gruppo:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25251,108 +25486,118 @@ msgstr ""
 "Si desidera veramente rimuovere il gruppo\n"
 "`%s' dalla barra dei collegamenti?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Non rimuovere"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Rimnomina questo Gruppo di Collegamento"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Rinomina questo gruppo di collegamento come:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Icone _Piccole"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Mostra i collegamenti come icone piccole "
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Icone _Grandi"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Mostra i collegamenti come icone grandi"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nuovo Gruppo..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Crea un nuovo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Rimuovi questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Rimuovi questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Rinomina questo Gruppo..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Rinomina questo gruppo di collegamento"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Nascondi la Barra dei Collegamenti"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Nascondi la barra dei collegamenti"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Crea un nuovo collegamento"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Crea un nuovo collegamento"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Rinomina collegamento"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Rinomina il collegamento selezionato come:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Aprire la cartella relativa a questo collegamento"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Aprire in una Nuova _Finestra"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 "Aprire la cartella relativa a questo collegamento in una nuova finestra"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Rinomina questo collegamento"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Ri_muovere"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Collegamenti"
 
@@ -25361,55 +25606,55 @@ msgstr "Collegamenti"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Esiste gi� una cartella con questo nome"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non � valido"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "La cartella non � vuota"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "la cartella specificata non � stata trovata"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Il tipo specificatp non � supportato"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "La cartella specificata non pu� essere modificata o rimossa"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Impossibile rendere una cartella figlia di uno dei suoi discendenti"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Impossibile creare una cartella con quel nome"
 
@@ -25464,63 +25709,63 @@ msgstr ""
 "L'errore del sistema di attivazione �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Errore CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Interrotto"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Argomento non valido"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Ha gi� una shell"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Nessun proprietario"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Non trovato"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Tipo non supportato"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Schema non supportato"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Opreazione non supportata"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Esiste"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI non valida"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Ha delle sottocartelle"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Spazio sul dispositivo esaurito"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "La shell precedente � scomparsa"
 
@@ -25544,6 +25789,26 @@ msgstr "Host"
 msgid "The following connections are currently active:"
 msgstr "Le seguenti connessioni sono al momento attive;"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Calendario"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contatti: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Posta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Attivit�"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nome della cartella:"
@@ -25556,6 +25821,34 @@ msgstr "Tipo di cartella:"
 msgid "Specify where to create the folder:"
 msgstr "Specificare dove creare la cartella:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crea _Nuova cartella..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome della cartella:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Nome del _Server:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Username:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Assistente Configurazione di Evolution"
@@ -25653,15 +25946,15 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution pu� importare dati dai seguenti file:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution sta ora terminando ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25681,53 +25974,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non chiedere di nuovo"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Impossibile inizializzare la shell di  Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Disabilita la schermata di avvio"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Inizio importazione"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Avvio degli Importatori Intelligenti"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file"
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
@@ -25764,115 +26057,109 @@ msgstr "Copia selezionato"
 msgid "Copy to Folder..."
 msgstr "_Copia nella Cartella..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Crea un nuovo contatto"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Crea una nuova lista di contatti"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Taglia selezionato"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Cancella il contatto selezionato"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Sposta i messaggi in un'altra cartella"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Incolla agli appunti"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Anteprime dei contatti da stampare"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "_Anteprima di Stampa"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Stampa i contatti selezionati"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Salva i contatti selezionati come VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Seleziona tutti i contatti"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Invia un messaggio ai contatti selezionati"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Invia un messaggio al contatto"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Invia contatto ad un'altra persona."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Mostra il contatto corrente"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Lista dei _Contatti"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Inoltra Contatto..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Salva come VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Cerca Contatti"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Seleziona Tutto"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Invia un _Messaggio al Contatto..."
@@ -25917,11 +26204,6 @@ msgstr "Mese"
 msgid "Previews the calendar to be printed"
 msgstr "Anteprime del calendario da stampare"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "_Anteprima di Stampa"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Stampa questo calendario"
@@ -25954,7 +26236,7 @@ msgstr "Settimana"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Chiudi"
 
@@ -25967,7 +26249,7 @@ msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Barra dagli strimenti principale"
 
@@ -25979,8 +26261,8 @@ msgstr "Anteprima dell'oggetto da stampare"
 msgid "Print this item"
 msgstr "Stampa questo oggetto"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Salva"
 
@@ -26005,9 +26287,9 @@ msgstr "Salva l'ogetto sol disco"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_File"
 
@@ -26017,7 +26299,7 @@ msgstr "Stampa _Busta..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Salva _Come..."
 
@@ -26031,8 +26313,8 @@ msgstr "Invia un _Messaggio al Contatto..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Salva"
 
@@ -26130,26 +26412,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Rimuovi permanentemente i messaggi cancellati da tutte le cartelle"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Nuovo Messaggio"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Sposta il messaggio in una nuova cartella"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Mostra messaggio in una finestra di anteprima"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Sottoscrivi e annulla sottoscrizione a cartelle su server remoti"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor delle Cartelle Virtuali..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Anteprima"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Sottoscrizione Cartelle..."
 
@@ -26250,7 +26542,7 @@ msgstr "Lista per Discussioni"
 msgid "_Expunge"
 msgstr "_Elimina per Sempre"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Cartelle"
 
@@ -26505,177 +26797,192 @@ msgstr "Messaggio Non Letto Precedente"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Risposta all'Attivit�"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Controlla se ci sono nuovi messaggio in tutte le cartelle"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Messaggio Importante Precedente"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Anteprima del messaggio da stampare"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Precedente"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Stampa questo messaggio"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Ri_dirigi"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ridirige (rimbalza) il messaggio selezionato a qualcuno"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Reimpostare il testo alla dimensione predefinita"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "C_erca Messaggio..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Pi� _Piccolo"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Salva il messaggio come un file di testo"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Effettua una ricerca nel messaggio visualizzato"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Imposta i parametri della pagina per la stampante corrente"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Mostra _Sorgente dell'Email"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Mostra_Headers completi"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Mostra messaggio in stile normale"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Mostra messaggio con tutti gli header di posta elettronica"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Mostra il sorgente grezzo del messaggio"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Dimensione del _Testo"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Annulla la cancellazione del messaggio selezionato"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Cartella Virtuale sulla Mailing _List..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Cartella Virtuale sul _Mittente..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Cartella Virtuale sui _Destinatari..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Cartella Virtuale per _Oggetto..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Copia nella Cartella"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Crea Filtro dal Messaggio"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Inoltra Messaggio"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Vai al"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_In linea"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Pi� _Grande"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Visualizzazione _Messaggio"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Sposta nella Cartella"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Messaggio Successivo"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Visualizzazione _Normale"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Apri Messaggio"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Messaggio Precedente"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Rinomina..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "S_trumenti"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Chiudi"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -26704,169 +27011,161 @@ msgstr ""
 msgid "For_mat"
 msgstr "For_mato"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Inserici un File di Testo..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Inserici un file come testo nel messaggio"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Inserici un file di testo..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Apri"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Cifra con PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Firma con PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Cifra con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Firma con S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salva con Nome"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Salva _Bozza"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Salva il file corrente con un nome diverso"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Invia"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Invia pi� _Tardi"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Invia pi� _tardi"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Invia il messaggio pi� tardi"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Invia questo messaggio adesso"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Frima questo messaggio con la chiave PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Frima questo messaggio con il Certificato di Firma S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Mostra/nasconde il campo BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Mostra/nasconde il campo CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Mostra/nasconde il campo di selezione Da"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Mostra/nasconde il campo Rispondi A"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Allegato..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Elimina tutti"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Campo _Da"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Campo _Rispondi-a:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Salva l'oggetto e chiudi la finestra di dialogo"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Aiuto"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Salva firma"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
@@ -26962,171 +27261,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Aggiungi alla _Barra dei Collegamenti"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Cambia il nome a questa cartella"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copia questa cartella"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Crea _Nuova cartella..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Creaun  collegamento a questa cartella nella barra dei collegamenti"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Crea nuova cartella"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Crea un nuovo collegamento"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Crea nuova cartella"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Elimina questa cartella"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "E_sci"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Finestra di Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Imporare dati da altre applicazioni"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Sposta questa cartella altrove"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Crea _Nuova cartella..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Apri in una Nuova Finestra"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Apre questa cartella in una nuova finestra"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Impostazioni _Pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Invia / Ricevi"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configurazione della Posta"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Mostra informazioni su Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Invia un Bug Report"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Invia un _Bug Report"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Inoltra un Bug Report usando Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Mostra/nasconde"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nascondi la barra delle cartelle"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nascondi la barra dei collegamenti"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Modifica il modo di funzionamento (connesso o disconnesso)."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Mostra la cartella selezionata"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ di Ximian Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Informazioni su Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Barra delle _Cartelle"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Cartelle"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Visualizza Cartella..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importa..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Sposta..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nuovo"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nuova Cartella"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Impostazioni _Pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_Nessuna Ricorrenza"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Invia / Ricevi"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Collegamento"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Barra dei Collegamenti"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Collegamento"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Stampa sommario"
@@ -27140,17 +27470,40 @@ msgid "Reload the view"
 msgstr "Aggiorna questa vista"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Card con Indirizzo"
+#, fuzzy
+msgid "By _Company"
+msgstr "Per Ditta"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Per Ditta"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Card con Indirizzo"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista Telefoni"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vista Settimanale"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Vista Giornaliera"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Vista Mensile"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vista della Settimana Lavorativa"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Come Cartella Inviati"
@@ -27175,13 +27528,19 @@ msgstr "Per Oggetto"
 msgid "Messages"
 msgstr "Messaggi"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Con Categoria"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Attivit�"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27333,11 +27692,11 @@ msgstr "Codifica dei Caratteri"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Cerca Editor"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Salva Ricerca"
 
@@ -27377,21 +27736,21 @@ msgstr "Messaggio"
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Trova Ora"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Annulla"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Trova Ora"
 
@@ -27405,18 +27764,175 @@ msgstr "Server Personale della Rubrica"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server personale del Calendario; fabbrica del calendario"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): impossibile inizializzare GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): impossibile inizializzare GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution non � in grado di prendere l'archivio locale della rubrica.\n"
+#~ "Questo fatto potrebbe essere stato causato da un crash del componente\n"
+#~ "della rubrica di evolution.\n"
+#~ "Per aiutarci a comprendere meglio ed infine risolvere il problema,\n"
+#~ "per favore inviare una email a Jon Trowbridge <trow@ximian.com>\n"
+#~ "con una descrizione dettagliata delle circostanze nelle quali questo "
+#~ "errore \n"
+#~ "si � verificato. Grazie"
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution non � in grado di prendere l'archivio locale della rubrica.\n"
+#~ "In circostanze normali non dovrebbe mai accadere.\n"
+#~ "Potrebbe essere necessario chiudere e riavviare Evolution per\n"
+#~ "correggere il problema."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Sposta..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Lo stato della riunione � cambiato.  Inviare una versione aggiornata?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Elimina questo Appuntamento"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Mittente: %s\n"
+#~ "Oggetto: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "Errore del protocollo SASL"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "Errore I/O: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Errore nella risposta di benvenuto: %s: probabilmente non fatale"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Richiesta di HELO scaduta: %s: non fatale"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Errore di risposta di HELO scaduta: %s: non fatale"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Richiesta QUIT scaduta: %s: non fatale"
+
+#~ msgid "Insert File"
+#~ msgstr "Inserici File"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "La data specificata non � valida."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "La data del messaggio verr� confrontata\n"
+#~ "con la data di avvio del filtro o di apertura\n"
+#~ "del vfolder, qualunque essa sia"
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Ditta"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor dlle News di Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Sicuro di voler cancellare questo aaccount delle news?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "� necessario configurare un' identit� prima di poter inviare questa email."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Notiziari"
+
+#~ msgid "Source"
+#~ msgstr "Sorgente"
+
+#~ msgid "Source Information"
+#~ msgstr "Informazione Sorgenti"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Salva su Disco..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Salva Messaggio con nome..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Esecuzione di comando shell: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Crea nuova cartella"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Il tipo di cartella selezionata non � valido\n"
+#~ "per l'operazione richiesta. "
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "I dati possono solo essere importati in cartelle locali"
+
+#~ msgid "_Contact List"
+#~ msgstr "Lista dei _Contatti"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Inserici un File di Testo..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Inserici un file come testo nel messaggio"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Inserici un file di testo..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Invia pi� _Tardi"
+
+#~ msgid "Send _later"
+#~ msgstr "Invia pi� _tardi"
+
+#~ msgid "Send the message later"
+#~ msgstr "Invia il messaggio pi� tardi"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Impostazioni _Pilot..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Sorgenti della Rubrica"
@@ -27579,10 +28095,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "File con la firma:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Cancella tutto tranne la firma"
 
@@ -27899,9 +28411,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Cartella di archiviazione posta (interna)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Impossibile connettersi allo store: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "Crea Cartella Virtuale da Questa Ricerca"
 
@@ -27947,9 +28456,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizzazione:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Ricorda questa password"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Invia la posta in formato HTML come predefinito."
 
@@ -28001,15 +28507,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Crea un _Nuovo Appuntamento"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Crea un nuovo appuntamento"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Crea una nuova richiesta di apppuntamento"
-
-#~ msgid "Create a new task"
-#~ msgstr "Crea una nuova attivit�"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Crea un evento per l'intera giornata"
 
@@ -28031,9 +28528,6 @@ msgstr "init_bonobo(): impossibile inizializzare Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Crea o modifica account si posta ed altre preferenze"
 
-#~ msgid "New Message"
-#~ msgstr "Nuovo Messaggio"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "Impostazioni _Posta..."
 
diff --git a/po/ja.po b/po/ja.po
index f6fd74c380..8e193f6796 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20010612\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-02-12 20:57+0900\n"
 "Last-Translator: Takuo KITAME <kitame@debian.org>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -38,7 +38,7 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 msgid "File As"
 msgstr "��̾"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "̾��"
@@ -346,46 +346,46 @@ msgstr "%s �� VCard"
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo �ν����������ޤ���Ǥ���"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "������..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "�ɤ߹�����..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "����������ɽ���ǥ��顼"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "LDAP �����Фإ����ɤ��ɲ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP �����Ф��饫���ɤ��ѹ���..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "������Ƽ¹���"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP �����η�̤������..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
@@ -478,11 +478,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Ϣ����"
 
@@ -498,23 +498,32 @@ msgstr "LDAP ������"
 msgid "LDAP server containing contact information"
 msgstr "Ϣ�������Τ���LDAP������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "����Ϣ����"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "Ϣ����(_C)"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "����Ϣ�����������ޤ�"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "����Ϣ����ꥹ��"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Ϣ����ꥹ��(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "����Ϣ����"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "Ϣ����(_C)"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "����Ϣ��������"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -537,30 +546,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(���� Evolution �� SSL �򥵥ݡ��Ȥ��Ƥ��ޤ���)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
 
@@ -568,11 +577,11 @@ msgstr "gnome-vfs �ν����������ޤ���Ǥ���"
 msgid "Other Contacts"
 msgstr "¾��Ϣ����"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "���ɥ쥹Ģ�򳫤����Ȥ�����ޤ���"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -582,7 +591,7 @@ msgstr ""
 "�����Ϥ�����, ���뤤�� LDAP �����Ф�����Ƥ��뤫�Τɤ��餫\n"
 "���̣���ޤ�"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -594,7 +603,7 @@ msgstr ""
 "���� OpenLDAP ����������� CVS ����������ץ�������\n"
 "����ѥ��뤷�ʤ���Фʤ�ޤ���\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,44 +611,44 @@ msgstr ""
 "���Υ��ɥ쥹Ģ�򳫤����Ȥ�����ޤ���Ǥ���. �ѥ���¸�ߤ�, ����������\n"
 "����äƤ��뤫�ɤ��������å����Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (user %s) �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "�����Τ�Τǽ����"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "�᡼��2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "���ƥ����"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "�ե�����ɤ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "�ܺ�..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "���٤ƤΥ��ƥ���"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "�ե�����֥饦����ɽ������ URI"
 
@@ -761,7 +770,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "���ɥ쥹Ģ�Υ�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -855,8 +864,8 @@ msgstr "����"
 msgid "Mappings"
 msgstr "�ޡ�����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "��"
@@ -908,8 +917,8 @@ msgstr "�����ϰ�(_C): "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "������..."
@@ -1098,15 +1107,15 @@ msgid "Using email address"
 msgstr "�����͹��ʪ�ν���Ǥ�"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "�ɲ�(_A)"
 
@@ -1152,12 +1161,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "�Խ�(_E)"
@@ -1272,10 +1281,10 @@ msgstr "���ɥ쥹Ģ��̾�����򥤥󥿡��ե������Τ���Υե����ȥ�"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "���"
 
@@ -1304,39 +1313,15 @@ msgstr "(%d ����ɽ��)"
 msgid "Unnamed Contact"
 msgstr "̾���Τʤ�Ϣ����"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "���ɥ쥹Ģ����Ϣ���������"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "�����Ԥ����Τ�Τ�ޤ�"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-#, fuzzy
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution �� �������륹�ȥ졼���Υ��ɥ쥹Ģ������Ǥ��ޤ��� ����Ϥ����餯 "
-"evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� ��ꡢ��"
-"����������򤷤����褹�뤿��ˡ�Jon Trowbridge <trow@ximian.com> �ޤǡ�����"
-"���顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ�������������������ꤤ����"
-"����"
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "���ɥ쥹Ģ����Ϣ���������"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "̾��������"
@@ -1358,15 +1343,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "��ư(_M)..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "���ƥ���(_C):"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "�ե����(_F)"
 
@@ -1480,11 +1460,12 @@ msgstr "HTML �᡼����������(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "���(_D)"
 
@@ -2725,7 +2706,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "���(_R)"
 
@@ -2789,7 +2770,7 @@ msgstr ""
 "���Υե�����ˤ��Ǥ�¸�ߤ��Ƥ��ޤ����ɲä��Ƥ��������Ǥ���?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "��鸡��"
 
@@ -2817,21 +2798,21 @@ msgid "Error getting book view"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "�����ɤ�����˥��顼��ȯ�����ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "�����ʥ��顼"
 
@@ -2839,8 +2820,8 @@ msgstr "�����ʥ��顼"
 msgid "Repository offline"
 msgstr "��ݥ��ȥꥪ�ե饤��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "���Ĥ�����ޤ���"
 
@@ -2857,7 +2838,7 @@ msgid "Protocol not supported"
 msgstr "�ץ��ȥ���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2880,48 +2861,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "�ե���� %s ��¸�ߤ��ޤ���"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "����¾�Υ��顼"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�ѹ�����¸�������Ǥ���?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "�ꥹ�Ȥ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "�����ɤ��ɲäǥ��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "�ꥹ�Ȥν�����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "�ꥹ�Ȥκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "�����ɤκ����˥��顼��ȯ�����ޤ���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "ɽ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "ɽ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2929,22 +2915,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "�����ɤʤ�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "�����ɤʤ�"
@@ -3017,7 +3003,7 @@ msgstr "���ɥ쥹Ģ"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard ����¸"
 
@@ -3057,7 +3043,7 @@ msgid "Pilot Settings..."
 msgstr "Pilot ������(_M)..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Ϣ�����ž��"
 
@@ -3066,8 +3052,8 @@ msgid "Send Message to Contact"
 msgstr "Ϣ����إ�å�����������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����"
@@ -3087,7 +3073,7 @@ msgid "Move to folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڼ��"
 
@@ -3098,20 +3084,20 @@ msgid "Copy"
 msgstr "���ԡ�"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ž���դ�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "���"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "���ߤ�ɽ��(_C)"
@@ -3280,7 +3266,7 @@ msgstr "�ޡ�����"
 msgid "Number of columns:"
 msgstr "���:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "���ץ����"
 
@@ -3371,26 +3357,26 @@ msgstr "���ݥ���Ȥ��Խ�(_E)"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "�⤤"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "�㤤"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "̤���"
@@ -3519,11 +3505,11 @@ msgstr "���顼����߻��� (ʬ)"
 msgid "_Edit appointment"
 msgstr "���ݥ���Ȥ��Խ�(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "�����Ϥ���ޤ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3535,13 +3521,13 @@ msgstr ""
 "���ꤹ��С�������̾�Υ�ޥ���������������ܥå���\n"
 "�ˤ�ɽ�����ޤ���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3558,7 +3544,7 @@ msgstr ""
 "\n"
 "�����ˤ��Υץ�������ư���Ƥ褤�Ǥ���?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "���٤ȼ��䤷�ʤ�"
@@ -3588,7 +3574,7 @@ msgstr "�������ޤ�"
 msgid "Comment contains"
 msgstr "�����Ȥ����Τ�Τ�ޤ�"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "�԰���"
 
@@ -3599,7 +3585,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
@@ -3621,18 +3607,18 @@ msgstr "%Yǯ%m��%d��"
 msgid "%d %B"
 msgstr "%m��%d��"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�������ӥ塼���������ޤ���Ǥ���. ORBit��OAF�����������å����Ƥ�������"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "��Ū"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "��̩"
@@ -3657,37 +3643,37 @@ msgstr "��"
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "����"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "�ӥ���"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���Ϥ��Ƥ��ʤ�"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "��λ���ޤ���"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3698,56 +3684,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "�ʤ�"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "�����֤�"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "�����ƺѤ�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "�Ϥ�"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "������"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "ʿ��"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "��"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "������"
 
@@ -3755,12 +3740,12 @@ msgstr "������"
 msgid "Folder containing appointments and events"
 msgstr "�ե�����ϥ��ݥ���Ȥȥ��٥�Ȥ�ޤ�Ǥޤ�"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
 
@@ -3768,44 +3753,62 @@ msgstr "������"
 msgid "Folder containing to-do items"
 msgstr "�ե������ ToDo ���ܤ�ޤ�"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "�������ݥ����"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "���ݥ����"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "�������ݥ���Ȥ�������ޤ�"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "�˥塼���ۿ�����"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "���"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "������������������ޤ�"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "����������"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "������(_T)"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "������������������ޤ�"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�������ݥ����"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "�������ݥ����"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "���ݥ����"
+msgid "Create a new all-day appointment"
+msgstr "�������ݥ���Ȥ�������ޤ�"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3872,7 +3875,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "�����ΰ�����Ȥ�:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "��"
 
@@ -3880,11 +3884,13 @@ msgstr "��"
 msgid "extra times every"
 msgstr "���λ�����˱�Ĺ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "ʬ"
 
@@ -4012,7 +4018,7 @@ msgstr "��¥��"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���ޥ�:"
 
@@ -4041,7 +4047,7 @@ msgstr "���ݥ���Ȥν�λ"
 msgid "hour(s)"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "ʬ"
 
@@ -4219,7 +4225,7 @@ msgid "_Fri"
 msgstr "��(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "����(_G)"
 
@@ -4264,19 +4270,33 @@ msgstr "��(_W)"
 msgid "before every appointment"
 msgstr "���ݥ���Ȥν�λ��"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "��ľ���Ϲ�������ޤ�������������Τ��������ޤ���?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�����ˤ��β�Ĥ򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�����ˤ��Υ������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�����ˤ��λ��������򥭥�󥻥뤷������Ƥ��������Ǥ���?"
 
@@ -4344,61 +4364,61 @@ msgstr " (���� "
 msgid "Due "
 msgstr "���� "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�������ե�����򹹿�����ޤ���Ǥ���"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "���ݥ���Ȥ��Խ�"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "���ݥ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "���ޥ�Ϥ���ޤ���"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4601,7 +4621,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4613,7 +4633,7 @@ msgstr "���"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���ơ�����"
@@ -4698,7 +4718,7 @@ msgstr "����"
 msgid "first"
 msgstr "̸"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr " ��"
 
@@ -4722,7 +4742,7 @@ msgstr "̸"
 msgid "Other Date"
 msgstr "����¾�� FAX"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "��"
 
@@ -4821,20 +4841,26 @@ msgstr "% ��λ"
 msgid "Date Completed:"
 msgstr "���:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "ư�ɬ��"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "ͥ����(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "���ơ�����(_S):"
 
@@ -4848,7 +4874,7 @@ msgstr "����"
 msgid "Assignment"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4917,81 +4943,81 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "����(_O)"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "��̾����¸..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "����(_P)..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ڼ��(_U)"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "���ԡ�(_C)"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Ž���դ�(_P)"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "��λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "��������λ�Ȥ��ƥޡ���(_M)"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "���򤷤�����������(_D)"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "���������ɲä���ˤϤ����򥯥�å�"
@@ -5000,8 +5026,8 @@ msgstr "���������ɲä���ˤϤ����򥯥�å�"
 msgid "Alarms"
 msgstr "���顼��"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "��λ���ޤ���"
 
@@ -5029,11 +5055,9 @@ msgstr "ͥ����"
 msgid "Start Date"
 msgstr "������"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "���ޥ�"
 
@@ -5075,110 +5099,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "�������ݥ����(_A)"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "�����������٥��"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "���"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "����������"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "����..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "�����ذ�ư(_T)"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "�������ذ�ư(_G)..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "����/¿˻ ����θ���(_P)"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "��̾����¸(_S)..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�ߡ��ƥ��󥰤Υ������塼��(_M)"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "iCalender�Ȥ���ž��(_C)"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "���ν�������ư�ˤ���(_M)"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "����������(_O)"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "���٤Ƥν��������(_A)"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "%s ��¹���˥��顼"
@@ -5226,7 +5249,7 @@ msgstr " (��� "
 msgid "Task Due: <b>"
 msgstr " (��� "
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "����������(_C):"
@@ -5237,343 +5260,350 @@ msgstr "����������(_C):"
 msgid "iCalendar Error"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "������������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>�ʤ�</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"�а�: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "���ơ�����(_S):"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "̤��"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��������������"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "���ष��"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "��ľ���"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "��Ĥ����"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "�����"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "��Ĥι����׵�"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "��Ĥ˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "��Ĥ򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> �ϲ�Ĥ򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "�����ʲ�ĥ�å�����"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> �ϸ������줿��ľ���Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �ϲ�Ĥ��׵���������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "�������򹹿�"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�ǿ��Υ�������������"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "�������ι����׵�"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �ϥ������γ�����Ƥ��������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "�������˴ؤ�������"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �ϥ������򥭥�󥻥뤷�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "�������򥭥�󥻥�"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "�����ʥ�������å�����"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �϶���/¿˻ �����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ������׵ᤷ�ޤ���"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "����/¿˻ ���׵�"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �� ���ʤ��ζ���/¿˻ ����˴ؤ����������ޤ���"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "����/¿˻ ���ֿ�"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "������ ����/¿˻ ��å�����"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "���Υ�å�������̤�б����׵��ޤ�Ǥ��ޤ�"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�������ե�������ɤ߹�����˥��顼��ȯ�����ޤ���"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy �ϼ¹ԤǤ��ޤ���Ǥ���"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "������λ\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "���������ե�����Ϲ����Ǥ��ޤ���Ǥ���!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "�����λ"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "�����ƥ������!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "�ե����������"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "�ե����������"
@@ -5619,7 +5649,7 @@ msgstr "������"
 msgid "Chair Persons"
 msgstr "��Ĺ"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "ɬ�׻��ü�"
 
@@ -5632,57 +5662,52 @@ msgid "Non-Participants"
 msgstr "�Ի��ü�"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "�Ŀ�"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "���롼��"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "�꥽����"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "����"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "��Ĺ"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "���üԤ�ɬ��"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Ǥ�ջ��ü�"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "�Ի��ü�"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "ư�ɬ��"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "����"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "��Ǥ����"
 
@@ -5772,49 +5797,46 @@ msgstr "��ij��ϻ���(_S):"
 msgid "Meeting _end time:"
 msgstr "��Ľ�λ����(_E):"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "'%s' �Υ��������ɤ߹��ळ�Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "'%s' ���ɤ߹��ळ�Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "���"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "�ե����������"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "�������ݥ����(_A)..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "���Υ��ݥ���Ȥ���(_D)"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5825,11 +5847,16 @@ msgstr "`%s' �Υե�����򳫤����Ȥ�����ޤ���Ǥ���"
 msgid "The method required to open `%s' is not supported"
 msgstr "'%s' �򳫤����Ȥ��׵ᤵ���᥽�åɤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�ե���� %s �򥪡��ץ���"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 ��"
@@ -5886,58 +5913,63 @@ msgstr "10 ��"
 msgid "September"
 msgstr "9 ��"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "��żԤ�ɬ�ܤǤ�"
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "���ץ����"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "����/¿˻ ����"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�������򹹿�"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�ꥹ�Ȥ򹹿�"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo �ν����������ޤ���Ǥ���"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "���ǥ����ե����ȥꥳ��ݡ��ͥ�Ȥ��������ޤ���Ǥ���"
 
@@ -6168,9 +6200,8 @@ msgid "Print Calendar"
 msgstr "���������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "�����ץ�ӥ塼"
 
@@ -6206,8 +6237,8 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "���٤ȼ��䤷�ʤ�"
 
@@ -6273,17 +6304,29 @@ msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Evolution �� VCard �ե�����򥤥�ݡ���"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"��å����� %s ��ե���� %s �����������ޤ���\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "��¥��"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "������������"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6292,112 +6335,112 @@ msgstr ""
 "Evolution �� Pine �᡼��ե������ȯ�����ޤ���\n"
 "Evolution �إ���ݡ��Ȥ��Ƥ��������Ǥ���?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "������"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8068,72 +8111,82 @@ msgstr "�ե���� '%s' ����¸��"
 msgid "You must be working online to complete this operation"
 msgstr "����ư���λ���뤿��˥���饤��Ǻ�Ȥ��ʤ���Фʤ�ޤ���"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "�ե��륿�ι�ʸ������˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "�ե��륿�¹���˥��顼: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "���ס���ե�����򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "���ס���ե������������뤳�Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "������ %d ������� (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "��å����� %d �Ǽ��Ԥ��ޤ���"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "�ե������Ʊ����"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "������ %d / %d �������"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "�����ʰ����Ǥ�"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "�����ʰ����Ǥ�"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "�ե��륿�����¹���˥��顼: %s: %s"
@@ -8189,7 +8242,7 @@ msgstr "��å��������ư"
 msgid "Copying messages"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8197,47 +8250,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "����󥻥뤷�ޤ���"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP�����Ф���ͽ�����ʤ�����������ޤ���: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "���ꤵ�줿�ե�����Ϥ���ޤ���"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���Υ�å�������Ź沽�Ǥ��ޤ���: �����Ԥ����ꤵ��Ƥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8245,18 +8298,18 @@ msgid ""
 "%.*s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "��å������Υǥ����ɤ˼��Ԥ��ޤ���"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "���Υ�å�����������Ǥ��ޤ���: ��ȥե����������Ǥ��ޤ���Ǥ���: %s"
@@ -8282,23 +8335,23 @@ msgid "Could not lock '%s'"
 msgstr "'%s' ����å�����ޤ���Ǥ���"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s �Υ��å��ե����������Ǥ��ޤ���Ǥ���: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "%s �Υ��å��ե�����������˥����ॢ���Ȥ��ޤ���. ��Ǥ��ľ���Ƥ�������"
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)��Ȥä����å��˼��Ԥ��ޤ���: %s"
@@ -8357,11 +8410,15 @@ msgstr "�᡼���ȥե�����ν񤭹�����˥��顼: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "�᡼���ȥե�����Υ��ԡ���˥��顼: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8496,7 +8553,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
@@ -8670,33 +8727,134 @@ msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�ե����������Ǥ��ޤ���: ���Υ��ȥ��Ǥ����������Ǥ�"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"ȯ��: %s\n"
-"�о�: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "��̾�ե�����:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ǧ�� ID"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "���ե����γ�"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "ǧ�ڤξ����˼��Ԥ��ޤ���"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ǧ�� ID"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "�����ʰ����Ǥ�"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ǧ�� ID"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ǧ�� ID"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
-"%s ���鵶�ξ�����Ǥ�:\n"
-"\n"
-"%s\n"
-"\n"
-"������˾�ߤޤ���?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8705,16 +8863,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%s ���鵶�ξ�����Ǥ�:\n"
+"\n"
+"%s\n"
+"\n"
+"������˾�ߤޤ���?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8734,32 +8909,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL `%s' ����Ϥ��뤳�Ȥ�����ޤ���Ǥ���"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s �� %s �Τ褦�ʥ�å������Ϥ���ޤ���"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�ե���������Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���������Ǥ�"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
@@ -8767,12 +8947,12 @@ msgstr "�ե�������͡���Ǥ��ޤ���: %s: ���Τ褦�ʥե�����Ϥ���ޤ���"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "�����Ф�ͽ�����ʤ����Ǥ򤷤ޤ���: %s"
@@ -8801,40 +8981,40 @@ msgstr "IMAP �����Фα����� %s �����ޤ�Ǥ��ޤ���"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����Ф���ͽ�����ʤ� OK ����������ޤ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�ǥ��쥯�ȥ� %s ���������ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s �Υ��ޥ꡼������ɽ���ޤ���Ǥ���"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "�ѹ����줿��å�������������"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "���Υ�å������ϸ������ѽ���ޤ���"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "������������������"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 
@@ -8843,10 +9023,10 @@ msgstr "FETCH �����˥�å��������Τ��դ��뤳�Ȥ�����ޤ���Ǥ���"
 msgid "Could not open cache directory: %s"
 msgstr "����å���ǥ��쥯�ȥ�򳫤����Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "��å������Υ���å���˼��Ԥ��ޤ��� %s: %s"
@@ -8859,7 +9039,7 @@ msgstr "����᡼��Υ����å�"
 msgid "Check for new messages in all folders"
 msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "�ե����"
 
@@ -8889,7 +9069,7 @@ msgstr "IMAP �����Фǥ᡼����ɤ�������Ѥ��뤿��Τ�ΤǤ�"
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "�ѥ����"
 
@@ -8898,73 +9078,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "���Υ��ץ����ϥץ쥤��ƥ����ȥѥ���ɤ�Ȥä� IMAP �����Ф���³���ޤ�"
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s �����ӥ� (�桼��: %s �ۥ��� %s)"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "��³�ϥ���󥻥뤷�ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "ǧ�ڤ˼��Ԥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "�ե���� `%s' ��¸�ߤ��ޤ���"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s �� IMAP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "�ѥ���ɤ����Ϥ��Ƥ��ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8975,31 +9159,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox�򳫤����Ȥ�����ޤ���: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9021,7 +9211,10 @@ msgid "Local delivery"
 msgstr "���������ۿ�"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "ɸ�� mbox �����ǥ�������᡼������"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9051,12 +9244,12 @@ msgstr "ɸ��Ū�� UNIX �� mbox ���ס���"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "ɸ�� mbox �ե�����ˤ˥�������᡼�����¸���ɤ߽Ф�"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9067,38 +9260,38 @@ msgstr "��¸���줿�롼�� %s �����Хѥ��ǤϤ���ޤ���"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "��������ؤ���¸�� inbox ����Ƥޤ���"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������᡼��ե����� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�ե������ %s ���� %s ��̾���ѹ����뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�ե�������饵�ޥ꡼�ե����� `%s' �������뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9160,7 +9353,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9198,26 +9391,26 @@ msgstr "maildir �����Υǥ��쥯�ȥ�ǤϤ���ޤ���"
 msgid "Could not scan folder `%s': %s"
 msgstr "�ե���� `%s' ����������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "maildir �ǥ��쥯�ȥ�ѥ��򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "����᡼��Υ����å�"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "������������������"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "�ե��������¸��"
@@ -9262,7 +9455,7 @@ msgstr "�ե�����Dz�����ǽ�ʥ��顼��ȯ�������褦�Ǥ�"
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "��å������β��˼��Ԥ��ޤ���: �ְ�ä��᡼��ܥå����Ǥ���?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9271,7 +9464,7 @@ msgstr ""
 "�ե����� `%s' �򳫤����Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9280,14 +9473,14 @@ msgstr ""
 "�ե����� `%s' ��������뤳�Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ���̾�Υե�����ǤϤ���ޤ���"
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9296,7 +9489,7 @@ msgstr ""
 "�ե���� `%s' �������뤳�Ȥ�����ޤ���Ǥ���:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "�ե���� `%s' �϶��ǤϤ���ޤ���. ������ޤ���"
@@ -9311,64 +9504,64 @@ msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "�ݥ������ %ld �ն� �ե���� %s ����̿Ū�ʥ᡼�빽ʸ���ϥ��顼�Ǥ�"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�ե����������å�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�ե�����򳫤����Ȥ�����ޤ���: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "�ƥ�ݥ�� mailbox �򳫤����Ȥ�����ޤ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���Υե���� %s ���Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "��ȥե�������Ĥ��뤳�Ȥ�����ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Ʊ�����ޤ�����, ���ޥ꡼�ȥե�������԰��פǤ�"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "̤�ΤΥ��顼: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�ե�������͡������ޤ���Ǥ���: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "��� mailbox �ؽ񤭽Ф���˥��顼: %s: %s"
@@ -9517,50 +9710,50 @@ msgstr "����󥻥�"
 msgid "Operation failed: %s"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP ���ޥ�������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "���ϥ���󥻥뤷�ޤ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�ե�������������ޤ���: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "������줿��å�������õ�ޤ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s �Υ�å������Ϥ���ޤ���"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP ������ %d �������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "��å��������������ޤ���: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "�����ʹ߿�"
@@ -9578,7 +9771,7 @@ msgstr "�����Ф˥�å�������Ĥ�"
 msgid "Delete after %s day(s)"
 msgstr "%s ����˺������"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9604,6 +9797,11 @@ msgstr ""
 "�Ф���³���ޤ�. ����ϸ�ʿ�ʥ��ݡ��Ȥ��׵᤹�륵���Ф�, ���٤ƤΥ桼��������"
 "��ư���櫓�ǤϤ���ޤ���."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "%s (�ݡ��� %d) ����³����ޤ���Ǥ���: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9615,54 +9813,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "%s �� POP �����Ф���³����ޤ���Ǥ���"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�׵ᤷ��ǧ�ڼ��ʤϥ��ݡ��Ȥ��Ƥ��ޤ���"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ���ޥ�ɤϼ��Ԥ��ޤ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/O ���顼"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s %s@%s �� POP3 �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "POP �����Ф���³�Ǥ��ޤ���\n"
 "�ѥ���ɤ�������˥��顼: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "���Τ褦�ʥե���� `%s' �Ϥ���ޤ���"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9689,35 +9889,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail �� fork ����ޤ���Ǥ���: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "��å���������������ޤ���Ǥ���: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail �ϥ����ʥ� %s �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s ��¹Խ���ޤ���Ǥ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail �ϥ��ơ����� %d �ǽ�λ���ޤ���: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail ��ͳ�ǥ᡼����ۿ�"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9825,45 +10025,45 @@ msgstr "���Ū��ǧ�ڤ˼��Ԥ��ޤ���"
 msgid "Authentication required"
 msgstr "ǧ�ڤ�ɬ�פȤ��Ƥ��ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP �����Ф���³����ޤ���\n"
 "�桼��̾��������˥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "���Υ�å������������������ǤϤ���ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s ���׵ᤷ��ǧ�ڥ����� %s �򥵥ݡ��Ȥ��Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s %s@%s �� SMTP �ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9874,90 +10074,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s ��ͳ�� SMTP �᡼����ۿ����ޤ�"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "��å���������������ޤ���: �����ԤΥ��ɥ쥹������������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "��å���������������ޤ���: �����Ԥ��������Ƥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET �쥹�ݥ󥹥��顼: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP ǧ��"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "SASL ǧ�ڥ��֥������Ȥ�������˥��顼��ȯ�����ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH �׵�˼��Ԥ��ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM �쥹�ݥ󥹥��顼: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
@@ -9965,91 +10165,91 @@ msgstr "DATA �׵�Υ����ॢ����: %s: �᡼����������ޤ���Ǥ���"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA �����Υ����ॢ����: ��å������ν�λ: %s: �᡼����������ޤ���Ǥ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "�����Ф���ְ�ä�ǧ�ڱ���������ޤ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH �׵�Υ����ॢ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET �쥹�ݥ󥹥��顼: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "ź��"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "ź��ʪ�ꥹ�Ȥ������򤷤������ƥ�������ޤ�"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "ź�դ��ɲ�..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "��å������إե������ź�դ��ޤ�"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "�ե������ź�ս���ޤ���: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "�ե����� %s ��ź�դǤ��ޤ���: �̾�Υե�����ǤϤ���ޤ���"
@@ -10067,56 +10267,60 @@ msgid "MIME type:"
 msgstr "MIME ������:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "���ɥ쥹Ģ�Τ���ˤ����ǥ���å�"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "���п�:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "�ֿ���:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "���п�:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "��̾:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "��å������μ����Ԥ����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��å������Υ����ܥ󥳥ԡ���������륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10124,17 +10328,25 @@ msgstr ""
 "��å������μ����ԥꥹ�Ȥ���˸���ʤ���, ��å������Υ����ܥ󥳥ԡ��������"
 "�륢�ɥ쥹�����Ϥ��ޤ�"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "�ݡ����ֹ�(_P):"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "�ե������ź�դ��ޤ�"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP ��̾����ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10143,34 +10355,34 @@ msgstr ""
 "�ե�������ɤ߹�����˥��顼: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�ٹ�!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "�ե������¸�ߤ��ޤ�����񤭤��ޤ���?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�ե��������¸��˥��顼: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "�ե�����Υ�������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�ե�����Υ���������˥��顼: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "���ǥ��������å��������������ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10179,7 +10391,7 @@ msgstr ""
 "�ե�����������Ǥ��ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10188,7 +10400,7 @@ msgstr ""
 "�ե�������ڤ�ͤ�뤳�Ȥ�����ޤ���: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10197,7 +10409,7 @@ msgstr ""
 "��å������μ�ư��¸��˥��顼: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10205,7 +10417,7 @@ msgstr ""
 "Evolution �� ����Υ��å�������¸����Ƥ��ʤ��ե������ȯ�����ޤ�����\n"
 "������ꥫ�Хꤷ�Ƥߤޤ���?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10215,49 +10427,45 @@ msgstr ""
 "\n"
 "�ѹ�����¸���ޤ���?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "�ե�����򳫤�"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "�ե����������"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "��̾����¸"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (�ǥե����)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "��å�������������ޤ�"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10266,9 +10474,9 @@ msgstr ""
 "�᡼�륳��ݡ��ͥ�Ȥˤޤ���������Ƥ��ʤ�����\n"
 "��å���������������ɥ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10332,8 +10540,8 @@ msgstr "��̾�����Τ�Τ�ޤ�"
 msgid "Subject does not contain"
 msgstr "��̾�����Τ�Τ�ޤޤʤ�"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10341,12 +10549,11 @@ msgstr ""
 "����̾���Υե�����Ϥ��Ǥ�¸�ߤ��ޤ�\n"
 "��񤭤��ޤ���?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "���Υѥ���ɤ򵭲�"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10445,150 +10652,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%p %I"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "ǯ"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "ǯ"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " ��"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "��"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "ʬ"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "��"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "��"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "��"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "��"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "��"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "��"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "ʬ"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "��"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr " ��"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "ǯ"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "ǯ"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "���դ������˺��Ƥ��ޤ�"
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "���������դ����򤷤Ƥ��ޤ�"
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"�ե��륿���¹Ԥ���롤�ޤ��ϲ��ۥե������\n"
-"������������å����������դϤɤ�ʻ��֤�\n"
-"�Ф��ƤǤ���Ӥ����Ǥ��礦"
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"��å����������դϤ����ǻ��ꤹ����֤��Ф���\n"
-"��Ӥ����Ǥ��礦"
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"��å����������դϥե��륿���¹Ԥ�������\n"
-"��Ϣ���Ƥ�����֤��Ф�����Ӥ����Ǥ��礦;\n"
-"�㤨�С�\"�콵����\""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "���߻���"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "���ꤹ�����"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "���߻���ؤ����л���"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "����оݤλ��֤�����"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "�����"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "��"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " ��"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "��"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y/%m/%d (%a)"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%m�� %d�� %p %l:%M"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " ��"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<���դ����򤹤뤿��ˤ����򥯥�å����Ƥ�������>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "����оݤλ��֤�����"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "�ե��륿�롼��"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "��������̾:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "���ס���`%s' ��¸�ߤ��ʤ����̾�Υե�����ǤϤ���ޤ���"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "��������������"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "����"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "ư����ɲ�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10596,12 +10753,12 @@ msgstr ""
 "�ե�����������˺��Ƥ��ޤ�\n"
 "��äƥ᡼�����������ͭ���ʥե��������ꤷ�Ƥ�������"
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "�ե����������"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10610,93 +10767,168 @@ msgstr ""
 "����ɽ�� '%s' �ǥ��顼�Ǥ�:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "����"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "�����"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "�ȡ���"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "��"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "�ƥ���"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "���Υե������̾�����ѹ����ޤ�"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "�롼��̾: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "�����ȥ�ʤ�"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "�⤷"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "���ξ���ư���¹�:"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "���٤Ƥδ�ब��ä���"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "�����Ĥ��δ�ब��ä���"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "�����ɲ�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "����"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "����"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "�����"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "�ե��륿���Խ�"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "���ۥե�������Խ�"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "����"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "����"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"��å����������դϤ����ǻ��ꤹ����֤��Ф���\n"
+"��Ӥ����Ǥ��礦"
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"��å����������դϥե��륿���¹Ԥ�������\n"
+"��Ϣ���Ƥ�����֤��Ф�����Ӥ����Ǥ��礦;\n"
+"�㤨�С�\"�콵����\""
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"��å����������դϤ����ǻ��ꤹ����֤��Ф���\n"
+"��Ӥ����Ǥ��礦"
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "���ۥե����"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "���߻���ؤ����л���"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "��"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "����ե��������"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "���߻���"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "���ꤹ�����"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "���ۥե�����Υ�����"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "���٤Ƥ�ͭ���ʥ�⡼�ȥե����"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "���٤ƤΥ��������ͭ���ʥ�⡼�ȥե����"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "���٤ƤΥ�������ե����"
 
@@ -10724,42 +10956,42 @@ msgid "Beep"
 msgstr "�٥꡼��"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "���"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "�����Τ�Τ�ޤ�"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "�ե�����إ��ԡ�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "�����Τ�Τ�ޤޤʤ�"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "�����Τ�Τǽ���ʤ�"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "��¸�ߤ��ʤ�"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "��¸�ߤ��ʤ�"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "�����Τ�ΤΤ褦�Ǥʤ�"
@@ -10781,92 +11013,88 @@ msgid "ends with"
 msgstr "�����Τ�Τǽ����"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "��¸�ߤ���"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "ɽ��"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "����"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�����Τ�ΤȰ��פ���"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "�����Τ�Τ���礭��"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "�����Τ�Τ�꾮����"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "�����Τ�ΤǤϤʤ�"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "�ե饰"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�᡼��󥰥ꥹ��"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "��å������إå�"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "�ե�����ذ�ư"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Ϣ����إ�å�����������"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "���ڤ����:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����Ѥ�"
 
@@ -10882,57 +11110,87 @@ msgstr "����ɽ���Ȱ���"
 msgid "Replied to"
 msgstr "�ֿ���"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�Ż�"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "�����Τ�Τ���礭��"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "�����Τ�Τ�꾮����"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "��Ͽ"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "���ơ���������"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "���"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "�����Τ�ΤΤ褦�˸�����"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "���������������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "����Υإå�"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "�����Τ�Τdz��Ϥ���"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "�������"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "��̾"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "���ơ���������"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�롼��"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "�롼����ɲ�"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "�롼����Խ�"
 
@@ -10940,12 +11198,12 @@ msgstr "�롼����Խ�"
 msgid "Score Rules"
 msgstr "�������롼��"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "���Υե������̾�����ѹ����ޤ�"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10953,31 +11211,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution �� ���ʤ��θŤ� Elm �᡼��򥤥�ݡ�����"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "����ݡ�����..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "���Ф餯���Ԥ���������"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "%s �� %s �Ȥ��ƥ���ݡ�����"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s ��������"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "�᡼��"
 
@@ -11038,39 +11296,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "����Ȣ"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "��������᡼��ե����� %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "�ǥ��쥯�ȥ��������"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "����ݡ��ȳ���"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "����"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "�ե��륿���Խ�"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11151,12 +11409,12 @@ msgstr "�᡼�륵�ޥꥳ��ݡ��ͥ�ȤΤ���Υե����ȥ�"
 msgid "Font Preferences"
 msgstr "�����֤��ʤ�(_N)"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "���������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11204,64 +11462,84 @@ msgstr "�ץ��ѥƥ�..."
 msgid "Change this folder's properties"
 msgstr "���Υե�����Υץ��ѥƥ����ѹ�"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "�᡼��ž���᥽�åɤ����꤬����ޤ���"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "�ٹ�: �ѹ����줿��å�����"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "�����᡼���å�����"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "��å�������᡼��(_M)"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "��å�������������ޤ�"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "���Υ�å�����"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "���Υ�å�����"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "�����᡼���å�����"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution �᡼�륳��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �᡼�����ꥳ��ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ե�������󥳥�ݡ��ͥ�Ȥν����������ޤ���"
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "�����Ф���³��..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "������ǥ��ȥ졼������Ͽ����ޤ���"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �Υץ��ѥƥ�"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "�ץ��ѥƥ�"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "��ȥǥ��쥯�ȥ���������ޤ���Ǥ���: %s"
@@ -11311,135 +11589,135 @@ msgstr "���%d��"
 msgid "Create _Virtual Folder From Search..."
 msgstr "��å��������鲾�ۥե���������(_V)"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "��̾�β��ۥե����(_S)"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "�����Ԥβ��ۥե����(_N)"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "�����Ԥβ��ۥե����(_R)"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "��̾�Υե��륿(_J)"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "�����ԤΥե��륿(_D)"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "�����ԤΥե��륿(_C)"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿(_M)"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "������å������Ȥ����Խ�..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "����(_P)"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�����Ԥ��ֿ�(_R)"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�ꥹ�Ȥ��ֿ�(_L)"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������ֿ�(_A)"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "ž��(_F)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "��λ���ޤ���"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���ꥢ"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�����ѤߤȤ��ƥޡ���(_K)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "̤�ɤȤ��ƥޡ���(_N)"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "���פȤ��ƥޡ���(_I)"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "����פȤ��ƥޡ���(_P)"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "������(_U)"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�����Ԥ򥢥ɥ쥹Ģ���ɲ�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�ե��륿Ŭ��"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "��å���������롼������(_L)"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�ȤΥե��륿 (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե���� (%s)"
@@ -11504,76 +11782,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "ɬ�פʾ���Τ��٤Ƥ����Ƥ��ޤ���"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution �˥塼�����ǥ���"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution ��������ȥ��ǥ���"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "�ۥ���(_H):"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "�桼��̾(_U):"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "�ѥ�(_P):"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Ʊ��̾���Υ�������Ȥ�2�ĺ����Ǥ��ޤ���"
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "�����ˤ��Υ�������Ȥ������Ƥ��������Ǥ���?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "������ʤ�"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "�����˥�������Ȥ������ޤ���?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "̵��"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "ͭ��"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "���������̾(_A):"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11582,30 +11851,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "%s �إ᡼��"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "��̾�� %s �Ǥ�"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "%s ����᡼��"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �᡼��󥰥ꥹ��"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "�ե��륿�롼����ɲ�"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11613,7 +11882,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11625,7 +11894,7 @@ msgstr ""
 "ɬ�פ�����ޤ�\n"
 "�����ꤷ�ޤ���?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11633,7 +11902,7 @@ msgstr ""
 "���ʤ��ϥ᡼�������������˥桼�������\n"
 "����򤹤�ɬ�פ�����ޤ�"
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11642,17 +11911,17 @@ msgstr ""
 "����������򤹤�ɬ�פ�����ޤ�"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "�Ȥˤ�����������?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11660,32 +11929,28 @@ msgstr ""
 "���Υ�å������Ϸ�̾������ޤ���\n"
 "�������������ޤ���?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "���Υ�å������� Bcc �������ꤵ��Ƥ��ޤ���"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "���Υ�å���������������Ŭ�ڤʼ����Ԥ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11693,28 +11958,28 @@ msgstr ""
 "���Υ�������Ȥ���ƥե�����򳫤����Ȥ�����ޤ���\n"
 "�ǥե���Ȥ���ƥե������ȤäƤ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "������������"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%Yǯ%m��%d��(%a)��%H��%Mʬ�� %%s ۩��:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "��å��������ư���ޤ�: "
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "��å������򥳥ԡ����ޤ�: "
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ %d ��å��������Խ����Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11722,7 +11987,7 @@ msgstr ""
 "�ɥ�եȥե���������¸���줿\n"
 "��å������������Խ����뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11730,39 +11995,39 @@ msgstr ""
 "�����ե�����Υ�å���������\n"
 "���������뤳�Ȥ�����ޤ�"
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ %d ��å�������������Ƥ��������Ǥ���?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "�ե�������񤭤��ޤ���?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "��å���������̾����¸..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "����̤�ɥ�å�������ɽ�����ޤ�"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11774,7 +12039,7 @@ msgstr ""
 "\n"
 "�����ˤ����Υ�å�������õ�ޤ���?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11783,28 +12048,28 @@ msgstr ""
 "�ե��륿����Υ�������˥��顼:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "�ե��륿"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "������ %d / %d �������"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "�����������"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "��å������ΰ����˼��Ԥ��ޤ���"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ %d ��å��������̥�����ɥ��dz����Ƥ��������Ǥ���?"
@@ -11825,7 +12090,7 @@ msgstr "����"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "̾���Τʤ�Ϣ����"
@@ -11846,20 +12111,21 @@ msgid "Add Signature"
 msgstr "��̾����¸"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "�ʲ��ˤ��ʤ���̾���ȥ᡼�륢�ɥ쥹�����Ϥ��Ƥ���������\"���ץ����\"\n"
 "�ե�����ɰʲ�������᡼��ˤ��ξ����ޤߤ����ʤ��ʤ餦���ɬ�פ�\n"
 "����ޤ���"
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�ʲ��˥᡼�륵���ФĤ��Ƥξ�������Ϥ��Ƥ����������⤷�褯ʬ����ʤ���Х���"
 "�ƥ�����Ԥ����󥿡��ͥåȥץ��Х��������̤��ƤߤƤ���������"
@@ -11869,24 +12135,23 @@ msgid "Please select among the following options"
 msgstr "���Υ��ץ���󤫤����򤷤Ƥ�������"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�����ץ��Ȥ��ĤˤĤ��Ƥξ�������Ϥ��Ƥ����������⤷���ʤ��λȤ�\n"
 "�ץ��ȥ�����Τ�ʤ��ʤ�С������ƥ�����Ԥ����󥿡��ͥåȥץ��Х�����\n"
 "Ϣ����ȤäƤߤƤ�������"
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "�᡼������ν����Ϥ���������λ���ޤ������󶡤����桼�����󡤥᡼�륵���Ф�\n"
 "�����ץ��ȥ���� �ҤȤĤ� Evolution �᡼�륢������Ȥ����ꤵ��ޤ���\n"
@@ -11894,43 +12159,20 @@ msgstr ""
 "���Ѥ���ޤ���"
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution��������ȥ����������"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "�����"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "�ȡ���"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "��"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "���������"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "�����ӥ�������å���"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "�����Ф���³��..."
 
@@ -12196,245 +12438,233 @@ msgstr "��¸�����Ĥ���"
 msgid "Loading Images"
 msgstr "�������ɤ߹���(_I)"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�᡼��ܥå����ξ��"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "��å������إå�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�ߥ����ͥ���"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP ������:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "�˥塼���ե�����(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "���ץ����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "���(_Z):"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP���� ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "���顼������"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "�������� Bcc �������ꤵ��Ƥ��ʤ������Τ餻��(_B)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "�ץ�ƥ����åɥץ饤�Х���(PGP)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "���򤷤�Ϣ�����������ޤ�"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "��å������򳫤����Ȥ�����ޤ���"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "����"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "���Υѥ���ɤ򵭲�"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "�ֿ���:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "�᡼��μ�����"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "�������ץ����"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "���Υѥ���ɤ򵭲�"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "ɬ�ܾ���"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "�ǥե����(_F)"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "�������ƥ�"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "�����奢 MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP �ץ�����������"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�᡼���������"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�����ѥ�å������ե����:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�����Ѥ���ƥ�å�����"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "�����Ф�ǧ�ڤ�ɬ��(_A)"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "�������:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���硼�ȥ��å�"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "��̾����¸"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "��̾����¸"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "������"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "����������"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "��������̾:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "ɸ��Ū�� UNIX �� mbox �ե�����"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12444,208 +12674,204 @@ msgstr ""
 "\n"
 "\"��\" �򥯥�å����ƻϤ�Ƥ�������"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "��"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "��˲�����ͥåȤ����ɤ߹���"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "ǧ�ڼ���: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "����᡼���ưŪ�˥����å�����ֳ�(_A)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ǧ�� ID"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "�ե�����Ǥκ����ǧ"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "�ǥե����(_F)"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "ͭ��"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "ž��"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "�ե�͡���(_F):"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML �᡼��"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "�桼������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "�����Ԥ����ɥ쥹Ģ�ˤ�����������ɤ߹���"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "���Υ�������Ȥ��������ꤹ��(_D)"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "���λ��֥ץ�ӥ塼����ȥ�å����������Ѥߤˤ���(_M):"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "̾��(_N):"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "������ͥåȤ����ɤ߹��ޤʤ�"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP �ץ������Υѥ�:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML �᡼���˾��Ǥ��ʤ������ HTML �᡼���������������Τ餻��"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�������˷�̾�����ξ����Τ餻��(_E)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "�᡼��μ���"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������ֿ�"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "�������ƥ�(_S)"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "�������ƥ�(_S)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�᡼�������"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "���֤���ꤷ��ɽ��"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "HTML��̾�ե�����(_H):"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "�������ƥ����ݸ�줿��³ (_SSL) ��ɬ��"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "�ѿ�"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "��"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " ���顼"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "����"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12669,202 +12895,212 @@ msgstr "S/MIME ����٥����ץ���ƥ����Ȥ��������ޤ���Ǥ���"
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME �ǥ����ɥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "ź�դ���¸"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�ƥ�ݥ�� mbox '%s' ������Ǥ��ޤ���Ǥ���: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "�ǥ���������¸..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "ź�դ���¸"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "����饤��ɽ��"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "%s �˳���..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "����饤��ɽ�� (%s��ͳ)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "�����ӥ塼��"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "�������ɤ߹���(_I)"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "��å����������Ƥ��ɤ߹�����"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "���¤�᤮�������ƥ�(_O)"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%m�� %d�� %p %l:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "�֥饦���ǥ�󥯤򳫤�"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "���򥳥ԡ�"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "��󥯤���̾����¸"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "��������¸..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ��ź��"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME ��å���������Ͻ���ޤ���Ǥ���, ��������ɽ�����ޤ�"
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "�������ɥ쥹:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "���п�"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "�ֿ���"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�᡼��: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "��å���������̾����¸..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP ���ڥ���ƥ����Ȥ��������ޤ���Ǥ���"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���쿮��Ǥ����ΤǤ�"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "���Υ�å������ϥǥ������̾���줿��ΤǤ���, ������������ޤ���"
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������ե����� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��⡼�ȥǡ��� (%s) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "̤�Τγ����ǡ��� (\"%s\" ������) ��ؤ��Ƥ��ޤ�"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "��������ե����"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "�ե������ƹ�����"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "�ե�����Υ᥿�������¸����ޤ���; ��Ϥ䤳�Υե�����򳫤�\n"
 "���Ȥ�����ʤ��ȵ��Ť��Ǥ��礦: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�ե�����Υ᥿����� %s ����¸�Ǥ��ޤ���: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "�ե�����Υ᥿�ǡ��� %s �������뤳�Ȥ�����ޤ���: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�ե���� \"%s\" �� \"%s\" �������ѹ����Ƥ��ޤ�"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12872,16 +13108,16 @@ msgstr ""
 "�⤷���Υ᡼��ܥå����򳫤����ȤϤʤ��ʤ�\n"
 "��ư�Dz���������ɬ�פ����뤫�⤷��ޤ���"
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "��������ե�����ʳ��η������ѹ��Ǥ��ޤ���"
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "/%s �����"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12890,7 +13126,7 @@ msgstr ""
 "'%s' �κݤ˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12899,7 +13135,7 @@ msgstr ""
 "���ν������Ƥ���֤˥��顼��ȯ�����ޤ���:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "�����"
 
@@ -12907,100 +13143,100 @@ msgstr "�����"
 msgid "Filtering Folder"
 msgstr "�ե������ե��륿��"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "�᡼��������"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ��������"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "������ %d / %d ��������"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "��å����� %d / %d �ϼ��Ԥ��ޤ���"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "��λ���ޤ���"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "�ե�����إ�å���������¸��"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s �إ�å��������ư��"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s �إ�å������򥳥ԡ���"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ����Υե������������"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "��å�������ž��"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�ե���� %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "��¸���줿 %s �򥪡��ץ���"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "�ե���� %s ������"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ե���� '%s' ����¸��"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "�ե�����򹹿���"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "�ե����������"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "������ %s �������"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d �̤Υ�å������������"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d �̤Υ�å���������¸��"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13009,7 +13245,7 @@ msgstr ""
 "���ϥե�������������ޤ���: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13018,11 +13254,11 @@ msgstr ""
 "�ե��������¸��˥��顼: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "ź�դ���¸��"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13031,27 +13267,22 @@ msgstr ""
 "���ϥե�������������ޤ���: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�ǡ�����񤭽Ф����Ȥ�����ޤ���Ǥ���: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s �Ȥ���³���ڤäƤ��ޤ�"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s �˺���³��"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "����(_S)"
 
@@ -13106,32 +13337,40 @@ msgstr ""
 msgid "Type: %s"
 msgstr "����: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "�᡼���������"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "���٤ƥ���󥻥�"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "������..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "�Ե���..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "���Υѥ���ɤ򵭲�(_R)"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s �Τ���Υѥ���ɤ����Ϥ��Ƥ�������"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
@@ -13158,7 +13397,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "̾��:"
 
@@ -13188,7 +13427,7 @@ msgstr "��å�������ž�����ޤ��� - %s"
 msgid "Forwarded message"
 msgstr "ž�����줿��å�����"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "ž�����줿��å�����"
 
@@ -13202,7 +13441,7 @@ msgstr "���ۥե�����������: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "URI �β��ۥե�����򹹿���: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13211,95 +13450,98 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "���ۥե����"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "�ե����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "���ۥե�������Խ�"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "�������ۥե����"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(��̾�ʤ�)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ������"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "̤��"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "����"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "�����Ѥ�"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "ʣ����̤�ɥ�å�����"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "ʣ���Υ�å�����"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "�Ǥ��㤤"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "�㤤"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "�⤤"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "�Ǥ�⤤"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "������ %p %l:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%p %l:%M (%a)"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%m�� %d�� %p %l:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%Yǯ %m�� %d��"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "��å������ꥹ�Ȥ������"
 
@@ -13334,47 +13576,47 @@ msgstr "������"
 msgid "Size"
 msgstr "������"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "�Ƥ��ᤷ"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "��˰�ư"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "����������"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "ž��"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "�ֿ�"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�������ֿ�"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "�ץ�ӥ塼"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13398,16 +13640,16 @@ msgstr "�ե���� \"%s\" �������"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "�ե���� \"%s\" �ι��ɲ����"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�ե����"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "���򤵤줿�����ФϤ���ޤ���"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "����������"
 
@@ -18295,11 +18537,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24252,8 +24494,8 @@ msgstr "����"
 msgid "Mail summary"
 msgstr "�᡼�륵�ޥ�"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "��������ե����"
 
@@ -24271,15 +24513,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com ����������"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "������"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "�˥塼���ۿ����ɲ�"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�ɲä������˥塼���ۿ��� URL ������"
 
@@ -24291,26 +24533,26 @@ msgstr "RDF �Υ������������˥��顼"
 msgid "News Feed"
 msgstr "�˥塼���ե�����"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "�ɲ�(_D)"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�ˤ狼��"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "�������Ϥ���ޤ���"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(�����ʤ�)"
 
@@ -25603,7 +25845,8 @@ msgid "Tasks "
 msgstr "������ "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "��ŷ��������"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25660,7 +25903,7 @@ msgstr "�ܺ٤�ɽ��"
 msgid "Cancel Operation"
 msgstr "���򥭥�󥻥�"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25674,21 +25917,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "�ե����������"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "���"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "����Ȣ"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "����Ȣ"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "����"
@@ -25919,22 +26162,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - �����ե�����κ���"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
-"ͭ���ǤϤ���ޤ���"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "�����ե���������(_N)..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "����..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(�����ȥ�ʤ�)"
 
@@ -25956,7 +26192,7 @@ msgstr ""
 "�⤷ʬ����ʤ��ʤ� \"��Ư\" �����򤹤뤳�Ȥ����衤Evolution �ϲ����ߤ��"
 "���礦"
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -25987,22 +26223,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ե���� %s ��¸�ߤ��ޤ���"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26011,11 +26243,11 @@ msgstr ""
 "�������Ȥ�����륤��ݡ��Ȥ�����ޤ���\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "����ݡ�����"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26024,17 +26256,17 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "%s �򳫻Ϥ��ޤ�"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "%s �γ�����˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "%s �Υ�������˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26043,54 +26275,54 @@ msgstr ""
 "%s �򥤥�ݡ�����\n"
 "�����ƥ� 1 �򥤥�ݡ�����"
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "��Ư"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "�ե�����̾:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "�ե��������:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "���󥰥�ե�����򥤥�ݡ��Ȥ��ޤ�"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "%s ����:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "�ե����������"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "���Υǡ����򥤥�ݡ��Ȥ���������Υե���������򤷤Ƥ�������"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "����ݡ���"
 
@@ -26136,9 +26368,14 @@ msgstr "�ե���� %s �򥪡��ץ���"
 msgid "in \"%s\" ..."
 msgstr "%s �˳���..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "�ե�������͡������ޤ���Ǥ���: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "���ꤵ�줿�ե������������뤳�Ȥ�����ޤ���:\n"
 "%s"
@@ -26155,8 +26392,8 @@ msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �᡼�륦�������ɥ��󥿡��ե������ν����������ޤ���"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�˥塼��"
@@ -26199,59 +26436,60 @@ msgstr "�ե�����ذ�ư..."
 msgid "Select the folder that you want to open"
 msgstr "���������ե���������򤷤ޤ�"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "�������硼�ȥ��åȤ�������ޤ�"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "���硼�ȥ��åȤˤ������ե���������򤷤ޤ�:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "����饤����"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "���ե饤����(_W)"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "���ե饤����"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(ɽ�������ե�����Ϥ���ޤ���)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(�ʤ�)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ���饤��Ǥ������ե饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �ϥ��ե饤�������Ǥ�"
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution �ϸ��ߥ��ե饤��Ǥ�������饤��ˤ���ˤϤ��Υܥ���򥯥��"
 "�����Ƥ�������"
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26259,12 +26497,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�����������֤Υ��åȥ��åפ�����ޤ��� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26272,31 +26510,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "OAF ����Ͽ����ޤ���"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "����ե����졼�����ǡ����١������ߤĤ���ޤ���"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "����Ū�ʥ��顼"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "���롼��̾:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26305,107 +26543,117 @@ msgstr ""
 "�����˥��硼�ȥ��åȥС����饰�롼��\n"
 "`%s' �����������Ǥ���?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "������ޤ���"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "���硼�ȥ��åȥ��롼�פ��͡���"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "���򤵤줿���硼�ȥ��åȥ��롼�פ��͡���:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "��������������(_S)"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "��������������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "�礭����������(_L)"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "�礭����������ǥ��硼�ȥ��åȤ�ɽ�����ޤ�"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "�������롼��(_N)..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "�������硼�ȥ��åȥ��롼�פ�������ޤ�"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "���Υ��롼�פ���(_R)..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ������ޤ�"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "���Υ��롼�פ��͡���(_N)..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "���Υ��硼�ȥ��åȥ��롼�פ��͡��ष�ޤ�"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "���硼�ȥ��åȥС��򱣤�(_H)"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "���硼�ȥ��åȥС��򱣤��ޤ�"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "�������硼�ȥ��åȤ�������ޤ�"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "�������硼�ȥ��åȤ�������ޤ�"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "���硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "���򤵤줿���硼�ȥ��åȤ��͡���:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򳫤�"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "����������ɥ��dz���(_W)"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "���Υ��硼�ȥ��åȤ˥�󥯤��줿�ե�����򿷤���������ɥ��dz���"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "��͡���(_R)"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "���Υ��硼�ȥ��åȤ��͡���"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "���(_M)"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "���硼�ȥ��åȥС����餳�Υ��硼�ȥ��åȤ������ޤ�"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "���硼�ȥ��åȤ���¸��˥��顼��ȯ�����ޤ���"
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "���硼�ȥ��å�"
 
@@ -26413,55 +26661,55 @@ msgstr "���硼�ȥ��å�"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "���顼�Ϥ���ޤ���"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Ʊ��̾���Υե���������Ǥ�¸�ߤ��Ƥ��ޤ�"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "���ꤵ�줿�ե�������̤�ͭ���ǤϤ���ޤ���"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O ���顼"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "�ե������������뽽ʬ�ʶ���������ޤ���"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "���ꤵ�줿�ե�����ϸ��դ���ޤ���Ǥ���"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "��ǽ�Ϥ��ε������֤Ǥϼ�������Ƥ��ޤ���"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "���ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "���ꤵ�줿���̤Ϥ��ε������֤Ǥϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "���ꤵ�줿�ե�������ѹ�������Ǥ��ޤ���Ǥ���"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "%s �Υե�������å���������뤳�Ȥ�����ޤ���: %s"
@@ -26506,74 +26754,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "I/O ���顼"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "�����ʰ����Ǥ�"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "�����ɤ����Ĥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "���ݡ��Ȥ��줿���̤�����å�(_C)"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "�桼���ˤ�ä����򥭥�󥻥뤵��ޤ���"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "����¾�Υ��顼"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "��¸�ߤ���"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "����"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "���Τ褦�ʥե���� %s �Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "���򤵤줿��å������Ϥ���ޤ���"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26598,6 +26846,26 @@ msgstr "�ۥ���"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "������"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Ϣ����(_N):"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "�᡼�� (_M)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "������"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "�ե����̾:"
@@ -26610,6 +26878,34 @@ msgstr "�ե��������:"
 msgid "Specify where to create the folder:"
 msgstr "�ե������������������ꤷ�Ƥ�������:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "�����ե���������(_N)..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "�ե����̾:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "������̾(_S):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "�桼��̾(_U):"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26701,15 +26997,15 @@ msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution �ϼ��Υǡ����򥤥�ݡ��ȤǤ��ޤ�:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution �Ϥ������޽�λ��Ǥ�..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26740,52 +27036,52 @@ msgstr ""
 "�桹�Ϥ��ʤ����桹�����̤�ڤ��ळ�Ȥ�˾��Ǥ��ޤ��������Ʋ桹��\n"
 "Ǯ���ˤ��ʤ��ι׸����Ԥ������Ƥ��ޤ�!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution��������\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution ������˥��������Ǥ��ޤ���"
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution ������ν�������Ǥ��ޤ���: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "���ץ�å�����̤�̵���ˤ���"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "����ݡ��ȳ���"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "����ݡ��ȳ���"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "���٤ƤΥ���ݡ��ͥ�ȤΥǥХå����Ϥ�ե����������"
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ����ݡ��ͥ�ȥ����ƥ����������ޤ���"
 
@@ -26826,116 +27122,110 @@ msgstr "���򤵤줿��Τ򥳥ԡ����ޤ�"
 msgid "Copy to Folder..."
 msgstr "�ե�����إ��ԡ�(_C)..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "����Ϣ�����������ޤ�"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "����Ϣ��������"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "���򤵤줿��Τ��ڤ���ޤ�"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "�̤Υե���������򤵤줿��å��������ư���ޤ�"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "����åץܡ��ɤ�Ž���դ��ޤ�"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "���������Ϣ�����ץ�ӥ塼����"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "�����ץ�ӥ塼(_V)"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "���򤷤�Ϣ�����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "���򤷤�Ϣ����������ޤ�"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "���٤�����"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "���٤Ƥ�Ϣ���������"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "���򤷤�Ϣ����˥�å�����������"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Ϣ����ˤإ�å�����������"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "¾�οͤ�Ϣ���������"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "���"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "�Ӥ߹��ߤ���ߤ��ޤ�"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "���߻���"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "ư��(_A)"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Ϣ����ꥹ��(_C)"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Ϣ�����ž��(_F)..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "�ե�����ذ�ư(_M)..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "VCard ����¸(_S)"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Ϣ����θ���(_S)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "���٤�����(_A)"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Ϣ����إ�å�����������(_M)..."
@@ -26980,11 +27270,6 @@ msgstr "��"
 msgid "Previews the calendar to be printed"
 msgstr "��������륫�����Υץ�ӥ塼��ɽ�����ޤ�"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "�����ץ�ӥ塼(_V)"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "���Υ�������������ޤ�"
@@ -27017,7 +27302,7 @@ msgstr "��"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "�Ĥ���"
 
@@ -27030,7 +27315,7 @@ msgid "Delete this item"
 msgstr "���Υ����ƥ�������ޤ�"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "�ᥤ��ġ���С�"
 
@@ -27042,8 +27327,8 @@ msgstr "��������륢���ƥ�Υץ�ӥ塼"
 msgid "Print this item"
 msgstr "���Υ����ƥ�����"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "��¸"
 
@@ -27068,9 +27353,9 @@ msgstr "�ǥ������ˤ��ι��ܤ���¸���ޤ�"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "�ե�����(_F)"
 
@@ -27080,7 +27365,7 @@ msgstr "ɽ������(_V)..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "��̾����¸(_A)..."
 
@@ -27094,8 +27379,8 @@ msgstr "Ϣ����إ�å�����������(_M)..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "��¸(_S)"
 
@@ -27192,26 +27477,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "���٤ƤΥե�����������ޡ������줿��å�������ʵ�Ū�˺�����ޤ�"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "������å������κ���"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "�ե�����إ�å���������¸��"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "��å������ץ�ӥ塼������ɥ���ɽ�����ޤ�"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�����о�Υե�����ι���/���ɲ���򤷤ޤ�"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "���ۥե�������ǥ���(_E)..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "�ե��륿(_F)..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "�ץ�ӥ塼�ڥ���(_P)"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "�ե���������..."
 
@@ -27308,7 +27603,7 @@ msgstr "��å������ꥹ�Ȥ򥹥�åɲ����ޤ�"
 msgid "_Expunge"
 msgstr "�������(_E)"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "�ե����(_F)"
 
@@ -27569,182 +27864,197 @@ msgstr "����̤�ɥ�å�����"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "�������˴ؤ�������"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "���٤ƤΥե�����ο���᡼�������å����ޤ�"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "���ν��פʥ�å�����"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "���������å������Υץ�ӥ塼"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "��"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "���Υ�å����������"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ï�������򤵤줿��å�������ž�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "��å������θ���(_E)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "�ƥ����ȥե�����إ�å���������¸���ޤ�"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "ɽ�����줿��å��������Τδޤޤ��ƥ����Ȥ򸡺����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "���ߤΥץ�󥿤Υڡ��������Ԥ��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "�᡼��Υ�������ɽ��(_S)"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "���٤ƤΥإå���ɽ��(_H)"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "�̾�Υ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "���٤ƤΥ᡼��إå���ޤ�ƥ�å�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "��å������Υ�������ɽ�����ޤ�"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "���򤵤줿��å������������ä��ޤ�"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "�᡼��󥰥ꥹ�Ȥβ��ۥե����(_L)..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "�����Ԥβ��ۥե����(_N)..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "�����Ԥβ��ۥե����(_R)..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "��̾�β��ۥե����(_S)..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "ź��"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "�ե�����إ��ԡ�(_C)"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "��å���������ե��륿�����(_C)"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "��å�������ž��(_F)"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "��ư"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "����饤��"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "�ݥ��٥�"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "��å�����ɽ��(_M)"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "�ե�����ذ�ư(_M)"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "���Υ�å�����"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "�̾�ɽ��(_N)"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "��å������򳫤�(_O)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "���Υ�å�����"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "��͡���(_R)..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "�ġ���(_T)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "������(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "���Υ�����ɥ����Ĥ��ޤ�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "�Ĥ���(_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "ɽ��(_V)"
 
@@ -27773,170 +28083,162 @@ msgstr "���Υ�å������� S/MIME �Ź�ǧ�ڤ��Ѥ��ưŹ沽���ޤ�"
 msgid "For_mat"
 msgstr "��"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "����饤��ƥ����ȥե�����(_F)..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "��å������إƥ����ȤȤ��ƥե�������������ޤ�"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "�ƥ����ȥե����������..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "�ե�����򳫤�"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP �ˤ��Ź沽"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP ������"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME �ˤ��Ź沽"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME ��̾"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "��̾����¸"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "��Ƥ���¸(_D)"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "�ե��������¸..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "���ߤΥե��������¸���ޤ�"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "���ߤΥե��������̾����¸���ޤ�"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "����Υե�����إ�å���������¸���ޤ�"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "�������(_L)"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "�������(_L)"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "HTML�����ǥ᡼����������ޤ�"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "��ǥ�å��������������ޤ�"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "���������Υ�å��������������ޤ�"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "ź�դ�ɽ��/��ɽ��"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "ź�դ�ɽ��(_A)"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "ź�դ�ɽ��"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "PGP���Ǥ��Υ�å������˥����󤷤ޤ�"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME ��̾������Ǥ��Υ�å������˥����󤷤ޤ�"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC �ե�����ɤ�ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC �ե�����ɤ�ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "���пͤ������ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "�ֿ���ե�����ɤ�ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "ź��(_A)..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Bcc �ե������(_B)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Cc �ե������(_C)"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "���٤ƺ��(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "���пͥե������(_F)"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "�ֿ���ե������(_R)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "���ܤ���¸���ƥ����������ܥå������Ĥ��ޤ�"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "�إ��(_H)"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "��̾����¸"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "���ɥե�����Υꥹ�Ȥإե�������ɲ�"
@@ -28034,171 +28336,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "���硼�ȥ��åȥС����ɲ�(_S)"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution ���硼�ȥ��å�"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "���Υե������̾�����ѹ����ޤ�"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "�ե�����򥳥ԡ����ޤ�"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "�����ե���������(_N)..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "���硼�ȥ��åȥС��ˤ��Υե�����Υ�󥯤�������ޤ�"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "�����ե������������ޤ�"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "�������硼�ȥ��åȤ�������ޤ�"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "�����ե������������ޤ�"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "���Υե�����������ޤ�"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�̤Υե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "��λ(_X)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution ������ɥ�(_W)"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "�ץ�������λ���ޤ�"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "�̤ξ��ؤ��Υե�������ư���ޤ�"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "�����ե���������(_N)..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "����������ɥ��dz���"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "�̤Υ�����ɥ��Ǥ��Υե�����򳫤��ޤ�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Pilot ������(_M)..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "���塼�ˤ���᡼����������ƿ����᡼���������ޤ�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "�᡼�������"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution �ˤĤ��Ƥξ����ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "�Զ���������"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "�Զ���������(_B)"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy��Ȥä��Զ���������"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "���ؤ�"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "�ե�����С���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "���硼�ȥ��åȥС���ɽ�����뤫�ɤ������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "���ե饤���Ȥ��ɤ��������ؤ��ޤ�"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "���򤵤줿�ե������ɽ�����ޤ�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution FAQ(_F)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Ximian Evolution �ˤĤ���(_A)..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "���ԡ�(_C)..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "�ե�����С�(_F)"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "�ե����(_F)"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "�ե�����ذ�ư(_G)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "����ݡ���..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "��ư(_M)..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "����(_N)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "�����ե����(_N)"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Pilot ������(_M)..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "�����֤��ʤ�(_N)"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "��͡���(_R)..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "������(_S)"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "���硼�ȥ��å�(_S)"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "���硼�ȥ��åȥС�(_S)"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "���硼�ȥ��å�(_S)"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "���ޥ����"
@@ -28212,17 +28545,40 @@ msgid "Reload the view"
 msgstr "�ӥ塼�κ��ɹ���"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "���ɥ쥹������"
+#, fuzzy
+msgid "By _Company"
+msgstr "���"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "���"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "���ɥ쥹������"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "���åꥹ��"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "��"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "��"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "��"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "ʿ��"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28248,13 +28604,19 @@ msgstr "��̾"
 msgid "Messages"
 msgstr "������"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "���ƥ���"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "������(_T)"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28408,11 +28770,11 @@ msgstr "���󥳡��ǥ���"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "�������Խ�"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "��������¸"
 
@@ -28452,21 +28814,21 @@ msgstr "������"
 msgid "Don't show this message again."
 msgstr "���Υ�å����������٤�ɽ�����ʤ�"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "����������"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "���ꥢ"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "����������"
 
@@ -28480,19 +28842,146 @@ msgstr "�ѡ����ʥ륢�ɥ쥹Ģ������"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "�ѡ����ʥ륫����������; �������ե����ȥ�"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME ���������뤳�Ȥ�����ޤ���Ǥ���"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 
 #, fuzzy
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution �� �������륹�ȥ졼���Υ��ɥ쥹Ģ������Ǥ��ޤ��� ����Ϥ�����"
+#~ "�� evolution-addressbook ����ݡ��ͥ�Ȥ�����å��夷�����Ȥˤ��ޤ��� ��"
+#~ "�ꡢ������������򤷤����褹�뤿��ˡ�Jon Trowbridge <trow@ximian.com> "
+#~ "�ޤǡ����Υ��顼�ξ����ˤĤ��Ƥξܺ٤�������᡼������äƤ��������������"
+#~ "�����ꤤ���ޤ���"
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "��ư(_M)..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "��ľ���Ϲ�������ޤ�������������Τ��������ޤ���?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "���Υ��ݥ���Ȥ���(_D)"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "ȯ��: %s\n"
+#~ "�о�: %s"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O ���顼"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "����������顼: %s: ���֤���̿Ū�ǤϤ���ޤ���"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO �쥹�ݥ󥹥��顼: %s: ��̿Ū�ǤϤ���ޤ���"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT �׵�Υ����ॢ����: %s: ��̿Ū�ǤϤ���ޤ���"
+
+#~ msgid "Insert File"
+#~ msgstr "�ե����������"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "���������դ����򤷤Ƥ��ޤ�"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "�ե��륿���¹Ԥ���롤�ޤ��ϲ��ۥե������\n"
+#~ "������������å����������դϤɤ�ʻ��֤�\n"
+#~ "�Ф��ƤǤ���Ӥ����Ǥ��礦"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution �˥塼�����ǥ���"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "������ news ��������Ȥ������Ƥ��������Ǥ���?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "���Υ᡼��������������˥�������Ȥ����ꤷ�ʤ���Фʤ�ޤ���"
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP ������:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "�˥塼���ե�����(_N)"
+
+#~ msgid "Source"
+#~ msgstr "������"
+
+#~ msgid "Source Information"
+#~ msgstr "����������"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "�ǥ���������¸..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "��å���������̾����¸..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - �����ե�����κ���"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "���򤷤��ե�����μ��̤��׵ᤵ�줿���Τ����\n"
+#~ "ͭ���ǤϤ���ޤ���"
+
+#~ msgid "_Contact List"
+#~ msgstr "Ϣ����ꥹ��(_C)"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "����饤��ƥ����ȥե�����(_F)..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "��å������إƥ����ȤȤ��ƥե�������������ޤ�"
+
+#~ msgid "Insert text file..."
+#~ msgstr "�ƥ����ȥե����������..."
+
+#~ msgid "Send _Later"
+#~ msgstr "�������(_L)"
+
+#~ msgid "Send _later"
+#~ msgstr "�������(_L)"
+
+#~ msgid "Send the message later"
+#~ msgstr "��ǥ�å��������������ޤ�"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Pilot ������(_M)..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "���ɥ쥹Ģ�Υ�����"
 
@@ -28614,10 +29103,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgstr "���򥭥�󥻥�"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "��̾�ե�����:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "��̾�ʳ�����"
 
@@ -28975,12 +29460,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Mobile"
 #~ msgstr "�����(_M)"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "�������ݥ���Ȥ�������ޤ�"
-
-#~ msgid "Create a new task"
-#~ msgstr "������������������ޤ�"
-
 #~ msgid "New _Task"
 #~ msgstr "����������(_T)"
 
@@ -29063,9 +29542,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ "it."
 #~ msgstr "����� POP �����Ф���³��, Kerberos 4 ǧ�ڤ�Ȥ��ޤ�."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "KPOP �����Ф�ǧ�ڽ���ޤ���Ǥ���: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "�����Ф���³���뤳�Ȥ�����ޤ���Ǥ���: %s"
 
@@ -29103,9 +29579,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "on or before"
 #~ msgstr "��������"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "���ȥ�����³���뤳�Ȥ�����ޤ���Ǥ���: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "�����᡼���å�����(_M)"
 
@@ -29146,9 +29619,6 @@ msgstr "init_bonobo(): Bonobo ���������뤳�Ȥ�����ޤ���Ǥ���"
 #~ msgid "_Organization:"
 #~ msgstr "���(_O):"
 
-#~ msgid "_Remember this password"
-#~ msgstr "���Υѥ���ɤ򵭲�(_R)"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�ǥե���Ȥ� HTML �����Υ᡼�����������(_S)"
 
diff --git a/po/ko.po b/po/ko.po
index c9d4874a8e..1aae1bc693 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.9\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-03-23 02:12+0900\n"
 "Last-Translator: ChiDeok, Hwang <hwang@mizi.co.kr>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 msgid "File As"
 msgstr "���Ϸ� ����:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�̸�"
@@ -367,54 +367,54 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "�˻�"
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "��ٸ��� �� ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
 "ã�⸦ ���൵�� ����: %s:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�޷� �ҷ�����..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr ""
 "�ڷ��� �д��� ���� �߻�:\n"
 "%s"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
@@ -507,11 +507,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 #, fuzzy
 msgid "Contacts"
 msgstr "����ó(_C)"
@@ -529,26 +529,35 @@ msgstr "LDAP ����"
 msgid "LDAP server containing contact information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "New Contact List"
+msgid "New Contact"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
-msgid "Contact _List"
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
 msgstr "����ó(_C)"
 
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact"
+msgid "Create a new contact"
+msgstr "���ο� ����ó�� �����"
+
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "New Contact List"
 msgstr "�� ����ó"
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "Contact _List"
 msgstr "����ó(_C)"
 
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "���ο� ����ó�� �����"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -567,27 +576,27 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
@@ -596,18 +605,18 @@ msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
 msgid "Other Contacts"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -615,51 +624,51 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "�̸��� 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "���"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "����..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "���:"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "���� Ž���Ⱑ ǥ���� URI"
 
@@ -782,7 +791,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "�ּҷ� �ҽ�"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -876,8 +885,8 @@ msgstr "���� ����"
 msgid "Mappings"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "����"
@@ -929,8 +938,8 @@ msgstr "�˻� ����:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "�˻�"
@@ -1120,15 +1129,15 @@ msgid "Using email address"
 msgstr "���ڿ��� �ּ�:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "�߰�(_A)"
 
@@ -1173,12 +1182,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "����(_E)"
@@ -1293,10 +1302,10 @@ msgstr "�ּҷ� �̸� ���� �������̽��� ���� ���丮"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "����"
 
@@ -1329,33 +1338,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "�ٸ� ����ó"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "����ó ã�ƺ���"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "������ �̸�"
@@ -1378,15 +1369,10 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "_Browse..."
-msgstr "�̵�"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#, fuzzy
 msgid "_Category:"
 msgstr "���:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "_Folder:"
 msgstr "����(_F)"
@@ -1500,11 +1486,12 @@ msgstr "HTML���� ���� ���(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "����(_D)"
 
@@ -2799,7 +2786,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 #, fuzzy
 msgid "_Remove"
 msgstr "����"
@@ -2866,7 +2853,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "���� �˻�"
 
@@ -2896,22 +2883,22 @@ msgid "Error getting book view"
 msgstr "%s��(��) �д��� ���� �߻�"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 #, fuzzy
 msgid "Error modifying card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "�� ������ ����"
 
@@ -2920,8 +2907,8 @@ msgstr "�� ������ ����"
 msgid "Repository offline"
 msgstr "�������ο��� �۾�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "�㰡�� �ź�"
 
@@ -2940,7 +2927,7 @@ msgid "Protocol not supported"
 msgstr "�۵��� �������� ����"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2964,37 +2951,42 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
+msgid "Addressbook does not exist"
+msgstr "���� `%s'�� �������� �ʽ��ϴ�."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+#, fuzzy
 msgid "Other error"
 msgstr "����� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "����Ȱ��� ���� �ϱ� ���Ͻʴϱ�?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 #, fuzzy
 msgid "Error adding list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 #, fuzzy
 msgid "Error adding card"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #, fuzzy
 msgid "Error modifying list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 #, fuzzy
 msgid "Error removing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
@@ -3002,17 +2994,17 @@ msgstr ""
 "�ڷ��� �д��� ���� �߻�:\n"
 "%s"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "ǥ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "ǥ��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3020,22 +3012,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "���� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "���� ����"
@@ -3121,7 +3113,7 @@ msgstr "�ּҷ� �߰�"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard�� ����"
 
@@ -3161,7 +3153,7 @@ msgid "Pilot Settings..."
 msgstr "���� ����(_M)..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�ٸ� �ּҷ� ����"
@@ -3172,8 +3164,8 @@ msgid "Send Message to Contact"
 msgstr "���߿� �޼����� �����ϴ�"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "�μ�"
@@ -3194,7 +3186,7 @@ msgid "Move to folder..."
 msgstr "������ �̵�..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ڸ���"
 
@@ -3205,20 +3197,20 @@ msgid "Copy"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "���̱�"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "����"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "ī��: "
@@ -3379,7 +3371,7 @@ msgstr "����"
 msgid "Number of columns:"
 msgstr "�� ��:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "����"
 
@@ -3471,26 +3463,26 @@ msgstr "����� �����ϱ�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "����"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "����"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "���Ǿȵ�"
@@ -3617,11 +3609,11 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "����� �����ϱ�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3629,13 +3621,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "���"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3646,7 +3638,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
@@ -3679,7 +3671,7 @@ msgstr "����:"
 msgid "Comment contains"
 msgstr "������������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3690,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3713,17 +3705,17 @@ msgstr "%Y/%m/%d"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3748,7 +3740,7 @@ msgstr "��"
 msgid "W"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3756,30 +3748,30 @@ msgstr "��"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "�ٻ�"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���� ����"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "�Ϸ��"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3787,59 +3779,58 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "�ݺ���"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "�ƴϿ�"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 #, fuzzy
 msgid "Day View"
 msgstr "ī��: "
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 #, fuzzy
 msgid "Week View"
 msgstr "��"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 #, fuzzy
 msgid "Month View"
 msgstr "��"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "�޷�"
 
@@ -3847,12 +3838,12 @@ msgstr "�޷�"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�۾�"
 
@@ -3861,44 +3852,63 @@ msgstr "�۾�"
 msgid "Folder containing to-do items"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "�� ���"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "���"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "���ο� ��Ӹ� �����"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "���� ���"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "���ο� ��Ӹ� �����"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "�۾�"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 #, fuzzy
-msgid "New All Day Appointment"
-msgstr "�� ���"
+msgid "Create a new task"
+msgstr "�� �޷��� ����ϴ�"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "All _Day Appointment"
+msgid "New All Day Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "New appointment"
+msgid "All _Day Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "���"
+msgid "Create a new all-day appointment"
+msgstr "���ο� ��Ӹ� �����"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3968,7 +3978,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "��"
 
@@ -3977,11 +3988,13 @@ msgstr "��"
 msgid "extra times every"
 msgstr "���� �ֱ�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "��"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "��"
 
@@ -4117,7 +4130,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "���"
 
@@ -4147,7 +4160,7 @@ msgstr "��� ��"
 msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "��"
 
@@ -4337,7 +4350,7 @@ msgid "_Fri"
 msgstr "��"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_General"
 msgstr "�Ϲ� ����"
@@ -4386,21 +4399,35 @@ msgstr "��"
 msgid "before every appointment"
 msgstr "��� ��������"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "������ �������� `%s'�� ����⸦ ���Ͻʴϱ�"
@@ -4471,61 +4498,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "����� ���ϵ��� ������ ���� �����ϴ�"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "����� �����Ѵ�"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "��� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "���� ���� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4742,7 +4769,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4754,7 +4781,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "����"
@@ -4839,7 +4866,7 @@ msgstr ""
 msgid "first"
 msgstr "��(_F):"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "��"
 
@@ -4863,7 +4890,7 @@ msgstr "���̱�"
 msgid "Other Date"
 msgstr "��Ÿ �ѽ�"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr ""
 
@@ -4963,20 +4990,27 @@ msgstr "% �Ϸ�(_p):"
 msgid "Date Completed:"
 msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "���� ����"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "�켱����(_P):"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "����(_S):"
 
@@ -4991,7 +5025,7 @@ msgstr ""
 msgid "Assignment"
 msgstr "�����"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5060,84 +5094,84 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "����ó�� �����"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "����"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "�μ�(_P)..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ڸ���(_u)"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "����(_C)"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "���̱�(_P)"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "�����"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�޷� �ҷ����̱�"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "�Ϸ� ǥ��"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�� ������ �����մϴ�"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5147,8 +5181,8 @@ msgstr "�۾���Ͽ� �߰��ϱ�"
 msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 #, fuzzy
 msgid "Complete"
 msgstr "�Ϸ��"
@@ -5177,11 +5211,9 @@ msgstr "�켱����"
 msgid "Start Date"
 msgstr "������ ��"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "���"
 
@@ -5221,115 +5253,114 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "����"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�� ���"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "���� ���"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�μ�..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "���÷� �̵�(_T)"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "��¥�� �̵�..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "���� ����"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "���� ����"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�ٸ��̸����� ����(_S)..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "����"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�޷� �ҷ����̱�"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "���� ������ ����"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�� �޼����� �����մϴ�"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "���� ������ ����: %s: %s"
@@ -5379,7 +5410,7 @@ msgstr "�Ϸ��"
 msgid "Task Due: <b>"
 msgstr "�Ϸ��"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "����� ����"
@@ -5390,366 +5421,373 @@ msgstr "����� ����"
 msgid "iCalendar Error"
 msgstr "�޷�"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "�� ������ ����"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"������ ��ġ: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "����(_S):"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "�ݴ�"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "������ ��������"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "�۾�"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ȯ��"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "������"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "�ݴ�"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 #, fuzzy
 msgid "Cancel"
 msgstr "��ҵ�"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "������ ��������"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "�۾��е�"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "�۾�"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "�۾�"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "ȸ��"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "���� ���"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "�޼����� ����"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "����� ����"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "�޼��� �μ�"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "�̰��� ���ڿ��� �ּ��Դϴ�(_T)"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "�޼��� �μ�"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "�޼��� �μ�"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy�� �����Ҽ� �����ϴ�."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�Ϸ�� ��¥:"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "������ �ּ�"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% �Ϸ�(_p):"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "���� ��¥"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "���� ����"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "���� ����"
@@ -5796,7 +5834,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "�� ������"
@@ -5812,60 +5850,54 @@ msgid "Non-Participants"
 msgstr "�� ������"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "�׷� �̸�:"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "�������:"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "����"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "�� ������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "���� ����"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "������"
@@ -5957,51 +5989,47 @@ msgstr "ȸ�� ���� �ð�(_s):"
 msgid "Meeting _end time:"
 msgstr "ȸ�� ���� �ð�(_e):"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ������ ����"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "�Ϸ� ��¥"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "����ó�� �����"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "���� ����"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�� ���..."
 
-#: calendar/gui/e-week-view.c:3489
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "�� ����� �����մϴ�"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -6012,11 +6040,16 @@ msgstr "`%s'���ִ� ������ ������ �����ϴ�"
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�޷� ����"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s ������ ����"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6074,58 +6107,63 @@ msgstr "�ÿ�"
 msgid "September"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "����� ����"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "���� ����"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "����� ����"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "����� ����"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�۾�"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "����"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo�� �ʱ�ȭ �Ҽ� �����ϴ�"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "�˶� ��� ���丮�� ������� �����ϴ�"
@@ -6357,9 +6395,8 @@ msgid "Print Calendar"
 msgstr ""
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "�μ� �̸�����"
 
@@ -6389,8 +6426,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
@@ -6447,128 +6484,140 @@ msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 msgid "Imports vCalendar files into Evolution"
 msgstr "GnomeCard ������ Evolution���� �����ɴϴ�"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"�޼����� ������ ����: %2$s �������� %1$s\n"
+"  %3$s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "������"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "�޷�"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "�޷� ����"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8188,79 +8237,89 @@ msgstr "%s ������ ����"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 #, fuzzy
 msgid "Syncing folders"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���� ��� ����: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "���� ������ ����: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "�ּҷ��� ������ �����ϴ�"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�޼��� %s�� ��������"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "���޵� �޽��� - %s"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "���� ����ȭ"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "÷��"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "÷��"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "���� � ������ ����: %s: %s"
@@ -8319,7 +8378,7 @@ msgstr "�޼��� ����"
 msgid "Copying messages"
 msgstr "�޽������� %s�� ����"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8327,46 +8386,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "��ҵ�."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "IMAP server�κ��� ����ġ���� �亯: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "�����ڰ� ������������"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8374,18 +8433,18 @@ msgid ""
 "%.*s"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "�ӽ� ������ ����� ����: %s"
@@ -8411,22 +8470,22 @@ msgid "Could not lock '%s'"
 msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "`%s'�� ��������� ������ �� �����ϴ�: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8485,11 +8544,15 @@ msgstr "���� �ӽ������� ������ �����߻�: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "���� �ӽ������� ������ �����߻�: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8610,7 +8673,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8785,26 +8848,130 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+"��������� ������ ���� �����ϴ�: %s\n"
+" %s"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "���� ����:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "�繫�� ����"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "÷��"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8813,16 +8980,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8837,32 +9016,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%s��(��) �д��� ���� �߻�"
+
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "�׷� �޼��� ����: %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -8870,12 +9054,12 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "�۾� ���"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8904,42 +9088,42 @@ msgstr "IMAP ������ �亯�� %s ������ ��������ʽ��ϴ�"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP �����κ��� ����ġ���� OK�亯�� ��: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "�� �޽����� ���� ������ ���� �����ϴ�"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8950,10 +9134,10 @@ msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�޼����� ������ ÷���մϴ�"
@@ -8968,7 +9152,7 @@ msgstr "�� ������ �ۼ��մϴ�"
 msgid "Check for new messages in all folders"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "����"
 
@@ -8999,7 +9183,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "��й�ȣ"
 
@@ -9007,71 +9191,75 @@ msgstr "��й�ȣ"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "������ ��ҵ�"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "�۵��� �������� ����"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "���� ����."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "���� `%s'�� �������� �ʽ��ϴ�."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9079,31 +9267,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "%s���� ������ ����"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s ���� ���� %s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s ���� ���� %s"
@@ -9126,7 +9320,9 @@ msgid "Local delivery"
 msgstr "���� ����"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9153,12 +9349,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9169,40 +9365,40 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "���� ���� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9263,7 +9459,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9303,26 +9499,26 @@ msgstr ""
 "���� `%s'�� ����� ����:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� �޼����� �����ϼ� �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "�޽������� ����"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9368,35 +9564,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9413,13 +9609,13 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9427,52 +9623,52 @@ msgstr ""
 "���� ���� %s�� �� ���� �����ϴ�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�ӽ� ������ ������ ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9624,51 +9820,51 @@ msgstr "��ҵ�"
 msgid "Operation failed: %s"
 msgstr "�۾� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP ����� ������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "�۾� ���"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "POP �޼��� %d�� ������"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "�� ������ ����"
@@ -9688,7 +9884,7 @@ msgstr "������ ���� �����"
 msgid "Delete after %s day(s)"
 msgstr "�� ������ �����մϴ�"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr ""
 
@@ -9709,6 +9905,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9718,50 +9919,52 @@ msgstr "KPOP �������� �����Ҽ� ����: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "%s Ÿ�� ������ ���� ����"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ������ ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "����� ����"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr ""
 
@@ -9786,35 +9989,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�޼����� ������ ����: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail�� ���� ���� ����"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -9922,41 +10125,40 @@ msgstr ""
 msgid "Authentication required"
 msgstr "������ �ʿ���"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s Ÿ�� ������ ���� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9964,89 +10166,89 @@ msgid ""
 "\n"
 msgstr "KPOP �������� �����Ҽ� ����: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "�޼����� ����"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "����� ����"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "����:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10054,86 +10256,86 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����Ʈ"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "÷��"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "÷������ ��Ͽ��� ������ �׸��� �����մϴ�"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "÷������ �߰�..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "����� ���� ������ �ƴϳ׿�."
@@ -10151,107 +10353,119 @@ msgid "MIME type:"
 msgstr "MIME ����:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "�ּҷ�"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "���� ���:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "ȸ�� �ּ�:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "���� ���:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "�޴� ���:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "�޼����� ���� ����� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�޼����� �纻�� ���� ����� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "���� ����:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "���� ��Ͽ��� ������ �޼����� �纻�� ���� ������� �ּҸ� �Է��ϼ���"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "��Ʈ:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "������ ÷���մϴ�"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 #, fuzzy
 msgid "Warning!"
 msgstr "���"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ �д��� ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "���� ������ ���� �߻�: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10260,7 +10474,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10269,7 +10483,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10278,13 +10492,13 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10294,50 +10508,45 @@ msgstr ""
 "\n"
 "����� ������ �����Ͻðڽ��ϱ�?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "���޵� �޽���"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "���� ����"
 
-#: composer/e-msg-composer.c:1569
-#, fuzzy
-msgid "Insert File"
-msgstr "�ؽ�Ʈ ���� ����"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "����:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr ""
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "���� �޼����� �ۼ��մϴ�"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10346,9 +10555,9 @@ msgstr ""
 "���� �Ż� ������ �Է��� �Ǿ����� �ʾұ⶧����\n"
 "�޽��� �ۼ�â�� ���� ���� �����ϴ�."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10424,19 +10633,18 @@ msgstr "����"
 msgid "Subject does not contain"
 msgstr "������������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "�� ��й�ȣ ���"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10543,145 +10751,102 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "����"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "����"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "��"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "��"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "��"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "��"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "��"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "��"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "��"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "��"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "��"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "��"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "��"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "��"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "����"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "����"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 #, fuzzy
 msgid "You have forgotten to choose a date."
 msgstr "��. ��¥ �����ؾ� �ϴ°� ��������:-)"
 
-#: filter/filter-datespec.c:196
-#, fuzzy
-msgid "You have chosen an invalid date."
-msgstr "��. ���� ��¥�� ���������ʳ׿�."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<��¥�� �����ҷ��� ���� ��������>"
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "���� �ð�"
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "����"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y/%m/%d"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "������ ��������"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "����"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<��¥�� �����ҷ��� ���� ��������>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "�Ÿ��� ��Ģ"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "���� �̸�:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "������ ��������"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "���� ����"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "���� �߰�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -10690,12 +10855,12 @@ msgstr ""
 "��, ���� ������ ���� �����̳׿�.\n"
 "�ڷ� ���ư� ������ ����� ������ �����ϼ���."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "���� ����"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10704,95 +10869,159 @@ msgstr ""
 "���Խ� '%s'���� ����:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "�߿�"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "��"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "�޴»��"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "��¥"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "�׽�Ʈ"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "�並 %s�� ����"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "��Ģ �̸�: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "�������"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "���� ����"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "��� ������ �� ������ ��"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "� �����̶� ������ ��"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "���� �߰�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "incoming"
 msgstr "�����°�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 #, fuzzy
 msgid "outgoing"
 msgstr "�����°�"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "�Ÿ��� ����"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "�������� ����"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "�����°�"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "�����°�"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "���� ����"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "������ ������"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "���� �ð�"
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "���� ���� �ҽ�"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10820,42 +11049,42 @@ msgid "Beep"
 msgstr "ũ��"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "ȸ��"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "������ ����"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���� ��¥"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "������������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "�������� ����"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "�������� ����"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr ""
@@ -10877,88 +11106,84 @@ msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "ǥ��"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "�߿�"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "�޼��� �Ӹ���"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "������ �̵�"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "���߿� �޼����� �����ϴ�"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "�Ҹ� ����"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "����"
 
@@ -10974,60 +11199,88 @@ msgstr ""
 msgid "Replied to"
 msgstr "ȸ��"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�ٻ�"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "���� ����"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "ȸ��"
+
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "ũ��"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "���� ����"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr ""
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 #, fuzzy
 msgid "Add Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 #, fuzzy
 msgid "Edit Rule"
 msgstr "���� �̸� ����"
@@ -11036,12 +11289,12 @@ msgstr "���� �̸� ����"
 msgid "Score Rules"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "�並 %s�� ����"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11049,18 +11302,18 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "��������"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -11068,15 +11321,15 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "\"%s\" ������ ��"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "����"
 
@@ -11133,42 +11386,42 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr ""
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "���� ���� ���� %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "IMAP ������ ���캾�ϴ�"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 #, fuzzy
 msgid "Starting import"
 msgstr "���� ��¥(_S):"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 #, fuzzy
 msgid "Settings"
 msgstr "����..."
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "�Ÿ��� ����"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11245,12 +11498,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "�޷� ����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "����"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "�޷� ����"
@@ -11304,67 +11557,87 @@ msgstr "����(_P)..."
 msgid "Change this folder's properties"
 msgstr ""
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "���޵� �޽���"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "���� �޼���(_M)"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "���� �޼����� �ۼ��մϴ�"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "�޼���"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "�޼��� �μ�"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "���� �޼���(_M)"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "����ϴ� ��..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\"������ ����"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "����"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�ӽ� ���丮�� ���� ���� �����ϴ�: %s"
@@ -11414,144 +11687,144 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "�޽����κ��� ���� ���� ����(_V)"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "���񿡵��� ��������(_S)"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "�����ڿ����� ��������(_R)"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "���񿡴��� �Ÿ���(_S)"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "�߼��ο����� �Ÿ���(_n)"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "�����ο����� �Ÿ���(_R)"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "�޼��� �μ�"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "�μ�(_P)"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "���� ������� ȸ��"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "��ü ȸ��(_A)"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "����(_F)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "�Ϸ��"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "���(_l)"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "���� ������ ǥ��(_k)"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "���� ���� ������ ǥ��(_n)"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "�߿�"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "���� ���� ������ ǥ��"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�ǻ츲(_U)"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "������ �̵�..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "������ ����(_C)..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�ּҷ� �߰�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�Ÿ��� ����"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "���ϸ� ����Ʈ������ ����"
@@ -11617,81 +11890,71 @@ msgstr ""
 msgid "mh"
 msgstr ""
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "Evolution ��ġ"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Host:"
 msgstr "ȣ��Ʈ:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "������̸�:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "���:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "������ �� ������ ����⸦ ���Ͻʴϱ�?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 #, fuzzy
 msgid "Don't delete"
 msgstr "�ǻ츲"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 #, fuzzy
 msgid "Really delete account?"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "���� ����"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11700,30 +11963,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "�Ÿ��� ����"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "����"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "���� ���:"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "�Ÿ��� ��Ģ�� �߰�"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11731,7 +11994,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11739,135 +12002,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�̸��� ������"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 #, fuzzy
 msgid "an unknown sender"
 msgstr "�� ������ ����"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "������ �۾� `%s'�� ����⸦ ���Ͻʴϱ�"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 #, fuzzy
 msgid "No Message Selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "�ٸ��̸����� �޼��� ����..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11875,36 +12134,36 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 #, fuzzy
 msgid "Filters"
 msgstr "���� �Ÿ���(_F)..."
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "�޼��� �μ�"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "�޼��� �μ��� ����"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
@@ -11925,7 +12184,7 @@ msgstr "����:"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "�ٸ� ����ó"
@@ -11948,15 +12207,14 @@ msgstr "����:"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11966,60 +12224,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Evolution ���� ������"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "��"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "�޴»��"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "��¥"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "����"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12273,454 +12505,436 @@ msgstr "������ ��ħ"
 msgid "Loading Images"
 msgstr "���޵� �޽���"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "���Ϲڽ� ����"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "ǥ��"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "NNTP Server:"
-msgstr "LDAP ����"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "�� ��������(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Optional Information"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "����ó�� �μ��մϴ�"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr ""
 "�޼����� ������ ����: %s\n"
 "  %s"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quoted"
 msgstr "�ο�(_Q)"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "�� ��й�ȣ ���"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "�޾���"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "�� ��й�ȣ ���"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Required Information"
 msgstr "����� ����"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "����"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP ���α׷� ������ ����"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "������ ������ �䱸�մϴ�"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "���� ����: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "���� ����(_S)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Source Information"
-msgstr "���� ����"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "���� �̸�:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 #, fuzzy
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "���̱�"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "���� ����:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "�� ������ �ۼ��մϴ�"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "���� ����"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "����"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "��"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�ٸ� �ּҷ� ����"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "��ü�̸�:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�̸��� ������"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "�⺻ �������� �ϱ�"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "�޼��� �Ӹ���"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "�̸�:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP ���"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "��ü ȸ��"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "����(_S)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "������ ����"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "����"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "����"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "����:"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12746,228 +12960,238 @@ msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 msgid "Could not create a S/MIME decode context."
 msgstr "�޽��� �ۼ� â�� ���� ���� �����ϴ�"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "÷������ ����"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�ӽ� mbox `%s'�� ������� �����ϴ�: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "��ũ�� ����..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "÷������ ����"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "%s���� ����..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "����"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "���޵� �޽���"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�޽��� ������ �о�帲"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%a %Y/%m/%d %I:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr ""
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "�����Ѱ� ����"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "������ ����(_f)... (��ĥ����)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 #, fuzzy
 msgid "Save Image as..."
 msgstr "�ٸ� �̸����� ����..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÷��"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "��¥"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "���ڿ��� �ּ�:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "������"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 #, fuzzy
 msgid "Reply-To"
 msgstr "ȸ�� �ּ�:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "�޴»��"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 #, fuzzy
 msgid "Cc"
 msgstr "����:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "���� ����:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "����"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "�ٸ��̸����� �޼��� ����..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr ""
 "%s ���丮�� ������ ���� �����ϴ�:\n"
 "%s"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "���� ����"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���� �缳��"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "������ ������ �����ϴ�: %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" ������ \"%s\" �������� �ٲٱ�"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "%s ����"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12976,7 +13200,7 @@ msgstr ""
 "�۾� ������ ������ �߻��߽��ϴ�:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr ""
 
@@ -12985,102 +13209,102 @@ msgstr ""
 msgid "Filtering Folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "������ ����"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ������ ��"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "�޼����� ����"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "%2$d�� %1$d�޽��� ���� (uid \"%3$s\")"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "�Ϸ��"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "�޼����� ������ ����"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�޽������� %s�� �̵�"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�޽������� %s�� ����"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "���޵� �޽���"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "%s ������ ����"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "���� �缳��"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "���� ����"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "�޼��� %s�� ��������"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "�޼������� ��������"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�޽������� ����"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13089,7 +13313,7 @@ msgstr ""
 "��������� ������ ���� �����ϴ�: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13098,11 +13322,11 @@ msgstr ""
 "%s�� �޽��� ������ ���� �߻�:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "÷�� ����"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13111,27 +13335,22 @@ msgstr ""
 "��� ������ ����� ����: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "����Ÿ�� �� ���� �����ϴ�: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "�޾���"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "�˻�(_S)"
 
@@ -13194,37 +13413,46 @@ msgstr ""
 msgid "Type: %s"
 msgstr "����:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "���� �ְ��ޱ�"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "��ҵ�"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 #, fuzzy
 msgid "Updating..."
 msgstr "������ ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 #, fuzzy
 msgid "Waiting..."
 msgstr "��ٸ��� �� ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 #, fuzzy
 msgid "User canceled operation."
 msgstr "����� ����"
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "�� ��й�ȣ ���"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "��й�ȣ"
@@ -13255,7 +13483,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr "�� ������ ����ų �̸��� �����ϼ���.���� \"����\"�̳� �Ǵ� \"��\"."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "�̸�:"
 
@@ -13286,7 +13514,7 @@ msgstr "���޵� �޽��� - %s"
 msgid "Forwarded message"
 msgstr "���޵� �޽���"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "���޵� �޽���"
@@ -13301,7 +13529,7 @@ msgstr "%s ������ ����"
 msgid "Updating vfolders for uri: %s"
 msgstr "%s ������ ����"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13310,97 +13538,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "���� ����"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "�������� ����"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "�� ��������"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "����: (���� ����)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "�޼���"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "�������� �������� �޼���"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "���� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 #, fuzzy
 msgid "Generating message list"
 msgstr "�޽������� ����"
@@ -13435,47 +13666,47 @@ msgstr "�޾���"
 msgid "Size"
 msgstr "ũ��"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "��ҵ�"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "������ ������ ����"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "���� ����"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "����"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "ȸ��"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "��ü ȸ��"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "�̸�����"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13499,17 +13730,17 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "����"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 #, fuzzy
 msgid "No server has been selected"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18295,11 +18526,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24158,8 +24389,8 @@ msgstr "����:"
 msgid "Mail summary"
 msgstr "���"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "���� ����"
@@ -24178,15 +24409,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24200,27 +24431,27 @@ msgstr "<b>�޷¸� �д��� ����</b>"
 msgid "News Feed"
 msgstr "�� ��������(_N)"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "�߰�"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 #, fuzzy
 msgid "No tasks"
 msgstr "����"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "����:"
@@ -25536,7 +25767,7 @@ msgstr "�۾�"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "Weather settings"
+msgid "Weather Settings"
 msgstr "������ �κ� ���"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25600,7 +25831,7 @@ msgstr "�ڼ���"
 msgid "Cancel Operation"
 msgstr "���� ���"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25612,21 +25843,21 @@ msgstr "������ ������ �����ϴ�: %s: %s"
 msgid "Add a Folder"
 msgstr "���� ����"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "�ʰ�"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr ""
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "����"
@@ -25842,20 +26073,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - �� ���� ����"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "�� ������ ����"
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "���ο�..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(�������)"
 
@@ -25872,7 +26098,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -25900,22 +26126,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "���� `%s'�� �������� �ʽ��ϴ�."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution ��ġ"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25924,11 +26146,11 @@ msgstr ""
 "������ ������ ���ִ� ������ �����ϴ�\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25937,17 +26159,17 @@ msgstr ""
 "%s�� ��������.\n"
 "%s�� �����մϴ�"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "%s��(��) �д��� ���� �߻�"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25956,56 +26178,56 @@ msgstr ""
 "%s�� �������� ��\n"
 "������ 1�� ������."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "�ڵ�"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "���� �̸�:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "������ ��������"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "���� ����:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "��������"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "���� ���:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 #, fuzzy
 msgid "Select folder"
 msgstr "���� ����"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "��������"
 
@@ -26051,9 +26273,14 @@ msgstr "%s ������ ����"
 msgid "in \"%s\" ..."
 msgstr "%s���� ����..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "`%s'���ִ� ������ ������ �����ϴ�"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "���õ� ������ ������ �� �����ϴ�:\n"
 "%s"
@@ -26070,8 +26297,8 @@ msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution �ۼ��Ⱑ �ʱ�ȭ���� �ʾҽ��ϴ�."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 #, fuzzy
 msgid "New"
@@ -26118,58 +26345,58 @@ msgstr "���� �̵�..."
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Work Offline"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "�������ο��� �۾�"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(ǥ�õ� ������ ����)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "(�̸� ����)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26177,12 +26404,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�ý��� ������ġ�� �����Ҽ� �����ϴ� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26190,32 +26417,32 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "���� ���� Druid"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "�Ϲ� ����"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "�׷� �̸�:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26224,117 +26451,127 @@ msgstr ""
 "���� ����κ��� `%s'�׷���\n"
 "������ ����ðڽ��ϱ�?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "������������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "���� ������(_S)"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "���� ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "ū ������(_L)"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "ū ���������� ���ื�� ����"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "�� �׷�(_N)..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "���� ���� ���߱�(_H)"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "���� ���븦 ����ϴ�"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "�� ����׷��� ����"
+
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "��Ģ �̸�: "
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "�� ����׷��� ����"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "����"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 #, fuzzy
 msgid "Shortcuts"
 msgstr "���� ����(_S)"
@@ -26343,56 +26580,56 @@ msgstr "���� ����(_S)"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "���� ����"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "���� �̸��� ������ �̹� �����մϴ�"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "������ ���� ������ �ùٸ��� �ʽ��ϴ�"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "����� ����"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "������ ����⿡ ����� ������ ����"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "�۵��� �������� ����"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "�� �����ü�� ������ ������ �������� �ʽ��ϴ�"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "������ ������ ã���� �����ϴ�"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "������ ������ �����ϴ�: %s: %s"
@@ -26437,73 +26674,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "÷��"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "(�̸� ����)"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "������ �߰ߵ��� �ʾҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "����� ����"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "����(_x)"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "�޷�"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "%s���� ������ ����"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "�޼����� �޾ҽ��ϴ�"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26530,6 +26767,26 @@ msgstr "ȣ��Ʈ:"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "�޷�"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "����ó(_C)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "����"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "�۾�"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "���� �̸�:"
@@ -26542,6 +26799,34 @@ msgstr "���� ����:"
 msgid "Specify where to create the folder:"
 msgstr "���� ���� ���� �����ϼ���:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "�� ������ ����"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "���� �̸�:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "���� ����::"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "������̸�:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26639,16 +26924,16 @@ msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "���� ����(_M)..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26668,7 +26953,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26677,47 +26962,47 @@ msgstr ""
 "�����մϴ�\n"
 "Evolution ��\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Evolution ���� �ʱ�ȭ �Ҽ� �����ϴ�."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "���� ��¥(_S):"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "���� ��¥(_S):"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���뺸 ������Ʈ �ý����� �ʱ�ȭ �Ҽ� �����ϴ�."
 
@@ -26757,128 +27042,120 @@ msgstr "�����Ѱ� ����"
 msgid "Copy to Folder..."
 msgstr "������ ����..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "���ο� ����ó�� �����"
-
-#: ui/evolution-addressbook.xml.h:7
-#, fuzzy
-msgid "Create new contact list"
-msgstr "���ο� ����ó�� �����"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "�����Ѱ� �ڸ�"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "������ �̵�..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "������ �̵�..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Ŭ�����忡�� �ٿ��ֱ�"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "�μ� �̸�����(_v)"
+
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "����ó�� �μ��մϴ�"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "���� ����"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "����ó�� �����"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "���߿� �޼����� �����ϴ�"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "�޼����� �� ������ �̵��մϴ�"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "����"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "���"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "���� �ð�"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "�ൿ(_A)"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "����ó(_C)"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "����ó(_C)..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "������ �̵�(_M)..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "VCard�� ����"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "����ó ã��(_S)"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "���� ����(_S)"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "���߿� �޼����� �����ϴ�"
@@ -26930,11 +27207,6 @@ msgstr "��(_M)"
 msgid "Previews the calendar to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "�μ� �̸�����(_v)"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -26972,7 +27244,7 @@ msgstr "��(_W)"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "�ݱ�"
 
@@ -26986,7 +27258,7 @@ msgid "Delete this item"
 msgstr "�� �׸� �����մϴ�"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -26999,8 +27271,8 @@ msgstr "�μ�� �޽����� �̸����ϴ�"
 msgid "Print this item"
 msgstr "�� �׸��� �μ�"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "����"
 
@@ -27027,9 +27299,9 @@ msgstr "�並 %s�� ����"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "����(_F)"
 
@@ -27039,7 +27311,7 @@ msgstr "���� �μ�(_v)..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "�ٸ��̸����� ����(_A)..."
 
@@ -27054,8 +27326,8 @@ msgstr "���߿� �޼����� �����ϴ�"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "����(_S)"
 
@@ -27163,27 +27435,37 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "�� �޼����� �ۼ��մϴ�"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "�޼����� ������ ����"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "���� ���� ������(_E)..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "���� �Ÿ���(_F)..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "�̸�����"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "������ �̵�(_M)..."
@@ -27289,7 +27571,7 @@ msgstr "������ �޼��� ���"
 msgid "_Expunge"
 msgstr "����(_E)"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "����(_F)"
 
@@ -27573,200 +27855,215 @@ msgstr "�޼��� �μ�"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "ȸ��"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "�޼����� �� ������ �����մϴ�"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "�μ�� �޽����� �̸����ϴ�"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "���� �޼���(_M)"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "��� ��� ����(_H)"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "�޼����� �� ������ �����մϴ�"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "�޼����� ������ ÷���մϴ�"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "������ �޼����� �μ��մϴ�"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "���ϸ� ����Ʈ������ ����"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "�߼��ڿ����� ��������(_n)"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "�����ڿ����� ��������(_R)"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "���񿡵��� ��������(_S)"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "÷��"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "������ ����"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "�޽����κ��� �Ÿ��� ����(_C)"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "���޵� �޽���"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "����"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "�ݴ�"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "�߻�"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "������ �̵�"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "�޼���"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Normal Display"
 msgstr "ǥ��"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Open Message"
 msgstr "�޼������� �ٽ� ������(_R)"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "�޼��� �μ�"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "�ο�(_Q)"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "����(_O)..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "����(_T)"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "�ǻ츲(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "�� â�� �ݽ��ϴ�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "�ݱ�(_C)"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "����(_V)"
 
@@ -27796,174 +28093,164 @@ msgstr ""
 msgid "For_mat"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-msgid "Inline Text _File..."
-msgstr "�ؽ�Ʈ ���� ����"
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "�޼����� �ؽ�Ʈ�� ������ �����մϴ�"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "�ؽ�Ʈ ���� ����"
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "������ ���ϴ�"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP ��ȣȭ"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP ����"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "S/MIME Encrypt"
 msgstr "PGP ��ȣȭ"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "�ٸ��̸����� ����"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "�ʰ��� ����(_D)"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "������ ����..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "���� ������ ����"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "���� ������ �ٸ��̸����� �����մϴ�"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "�޼����� ������ ������ �����մϴ�"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "����"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "���߿� ����(_L)"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "���߿� ����(_L)"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "������ HTML�������� ����"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "���߿� �޼����� �����ϴ�"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "�� �޼����� ���� �����ϴ�"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "÷�ι� ����/����"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "÷�ι� ����(_a)"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "÷�ι� ����"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "�� �޼����� PGPŰ�� ������"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�� �޼����� PGPŰ�� ������"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "���� ����C �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "���� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "�߽� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ȸ�� �ּ� �׸��� ������ �������� ����"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "_Attachment..."
 msgstr "÷��(_A)"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "���� ���� �׸�(_B)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "���� �׸�(_C)"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "_Delete all"
 msgstr "����(_D)"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "�߽� �׸�(_F)"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "����(_O)..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "ȸ�� �ּ� �׸�(_R)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "�۾��� �������� ���̾�α׸� �ݴ´�"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "����(_H)"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "����:"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -28071,186 +28358,216 @@ msgstr "���� ����(_S)"
 
 #: ui/evolution.xml.h:3
 #, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution ��ġ"
+
+#: ui/evolution.xml.h:4
+#, fuzzy
 msgid "Change the name of this folder"
 msgstr "�並 %s�� ����"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "Copy this folder"
 msgstr "������ ����"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Create _New Folder..."
 msgstr "�� ������ ����"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Create a new folder"
 msgstr "�� ������ ����"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "�� ����׷��� ����"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "�� ������ ����"
+
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Delete this folder"
 msgstr "�� �׸� �����մϴ�"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�ٸ� ������ ǥ��"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "����(_x)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution ��ġ"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "���α׷��� ��Ĩ�ϴ�"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "%s��(��) �������� �̵�"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "�� ������ ����"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "���� ����(_M)..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "������ �ޱ�"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�и� ������ ������ �� ������ �����´�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "���� ����"
+
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Evolution�� ���� ����"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "���� ����"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "���� ����(_B)"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy�� ���������� �մϴ�"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 #, fuzzy
 msgid "Toggle whether we are working offline."
 msgstr "�߽� �׸��� ������ �������� ����"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "���õ� ���� ����"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution��..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution��(_A)..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Copy..."
 msgstr "����(_C)"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "����(_F)"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "������ ����(_G)..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "��������"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Move..."
 msgstr "�̵�"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "���ο�(_N)"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "�� ��������(_N)"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "���� ����(_M)..."
+msgid "_Preferences..."
+msgstr "�޷� ����"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Rename..."
 msgstr "����(_O)..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "������ �ޱ�(_S)"
 
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Shortcut"
+#: ui/evolution.xml.h:59
+msgid "_Shortcut Bar"
 msgstr "���� ����(_S)"
 
-#: ui/evolution.xml.h:55
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
 msgstr "���� ����(_S)"
 
 #: ui/my-evolution.xml.h:3
@@ -28269,19 +28586,39 @@ msgstr ""
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
-msgid "Address Cards"
-msgstr "�ּ� _2:"
+msgid "By _Company"
+msgstr "ȸ��"
 
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "ȸ��"
+msgid "_Address Cards"
+msgstr "�ּ� _2:"
 
 #: views/addressbook/galview.xml.h:3
 #, fuzzy
-msgid "Phone List"
+msgid "_Phone List"
 msgstr "��ȭ ����"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "��"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "ī��: "
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "��"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "��"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28311,14 +28648,19 @@ msgstr "����"
 msgid "Messages"
 msgstr "�޼���"
 
-#: views/tasks/galview.xml.h:2
+#: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With Category"
+msgid "With _Category"
 msgstr "���:"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "�۾�"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28476,12 +28818,12 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 #, fuzzy
 msgid "Search Editor"
 msgstr "����ó ������"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr ""
 
@@ -28521,22 +28863,22 @@ msgstr "�޼���"
 msgid "Don't show this message again."
 msgstr "�� �޼����� �ٽ� �� �� �����ϴ�"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "�"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "���(_l)"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "���(_l)"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Find Now"
 msgstr "�"
@@ -28551,19 +28893,95 @@ msgstr "���ο� �ּҷ� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS�� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �׳��� �ʱ�ȭ �� �� �����ϴ�"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "�̵�"
+
+#, fuzzy
+#~ msgid "_Delete this Appointment"
+#~ msgstr "�� ����� �����մϴ�"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "����� ����"
+
+#, fuzzy
+#~ msgid "Insert File"
+#~ msgstr "�ؽ�Ʈ ���� ����"
+
+#, fuzzy
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "��. ���� ��¥�� ���������ʳ׿�."
+
+#, fuzzy
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution ��ġ"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "������ �� �� ������ ����⸦ ���Ͻʴϱ�?"
+
+#, fuzzy
+#~ msgid "NNTP Server:"
+#~ msgstr "LDAP ����"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "�� ��������(_N)"
+
+#, fuzzy
+#~ msgid "Source Information"
+#~ msgstr "���� ����"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "��ũ�� ����..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "�ٸ��̸����� �޼��� ����..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - �� ���� ����"
+
+#, fuzzy
+#~ msgid "_Contact List"
+#~ msgstr "����ó(_C)"
+
+#, fuzzy
+#~ msgid "Inline Text _File..."
+#~ msgstr "�ؽ�Ʈ ���� ����"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "�޼����� �ؽ�Ʈ�� ������ �����մϴ�"
+
+#~ msgid "Insert text file..."
+#~ msgstr "�ؽ�Ʈ ���� ����"
+
+#~ msgid "Send _Later"
+#~ msgstr "���߿� ����(_L)"
+
+#~ msgid "Send _later"
+#~ msgstr "���߿� ����(_L)"
+
+#~ msgid "Send the message later"
+#~ msgstr "���߿� �޼����� �����ϴ�"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "���� ����(_M)..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "�ּҷ� �ҽ�"
 
@@ -28635,10 +29053,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���� ���"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "���� ����:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "���� ������ ��������"
 
@@ -28862,9 +29276,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "_Mobile"
 #~ msgstr "�޴���ȭ(_M)"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "���ο� ��Ӹ� �����"
-
 #, fuzzy
 #~ msgid "Create new appointments with a default _reminder"
 #~ msgstr "���ο� ��Ӹ� �����"
@@ -28891,9 +29302,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "�޼����� ������ ����: %s"
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "KPOP �������� �����Ҽ� ����: %s"
-
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "�޼������� ���� ����� �˾Ƴ����� ����"
 
@@ -28907,10 +29315,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "�޼����� ���½��ϴ�"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "KPOP �������� �����Ҽ� ����: %s"
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "���� �޼���(_M)"
 
@@ -28945,10 +29349,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "����:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "�� ��й�ȣ ���"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�⺻���� ������ HTML�������� ����"
 
@@ -28991,10 +29391,6 @@ msgstr "init_bonobo(): Bonobo�� �ʱ�ȭ �� �� �����ϴ�"
 #~ msgstr "���ο� ��Ӹ� �����"
 
 #, fuzzy
-#~ msgid "Create a New _Task"
-#~ msgstr "�� �޷��� ����ϴ�"
-
-#, fuzzy
 #~ msgid "Create a _New Appointment"
 #~ msgstr "���ο� ��Ӹ� �����"
 
diff --git a/po/lt.po b/po/lt.po
index 4afc2f69d5..9c5e8dab97 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-10-28 22:33+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Your language <komp_lt@konferencijos.lt>\n"
@@ -36,7 +36,7 @@ msgstr "Importuoja VCard bylas � Evolution."
 msgid "File As"
 msgstr "Saugoti kaip"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Vardas"
@@ -344,46 +344,46 @@ msgstr "%s VCard"
 msgid "Could not initialize Bonobo"
 msgstr "Negal�jau inicializuoti Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Ie�koma..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "�keliama..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Klaida paie�kos i�rai�koje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Pridedama kortel� � LDAP server�..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Pa�alinama kortel� i� LDAP serverio..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Taisoma kortel� LDAP serveryje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Paie�ka pradedama i� naujo."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Gaunami LDAP paie�kos rezultatai..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Klaida pa�alinant kortel�"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
@@ -479,11 +479,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -499,23 +499,32 @@ msgstr "LDAP serveris"
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kuriame laikoma kontakt� informacija"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Naujas kontaktas"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontaktas"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sukurti nauj� kontakt�"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Naujas kontakt� s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Kontakt� _s�ra�as"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Naujas kontaktas"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontaktas"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sukurti nauj� kontakt� s�ra��"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -537,30 +546,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Negal�jau inicializuoti gnome-vfs"
 
@@ -568,11 +577,11 @@ msgstr "Negal�jau inicializuoti gnome-vfs"
 msgid "Other Contacts"
 msgstr "Kiti kontaktai"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adres� knygel�s"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -582,7 +591,7 @@ msgstr ""
 "kad arba tu �vedei neteising� URI, arba tavo LDAP serveris\n"
 "neveikia"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -594,7 +603,7 @@ msgstr ""
 "tu turi sukompiliuoti program� i� CVS �altinio, prie� tai\n"
 "parsisiunt�s OpenLDAP i� �emiau esan�io adreso.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,44 +611,44 @@ msgstr ""
 "Mes negal�jome atidaryti �ios adres� knygel�s. Pra�om patikrinti, ar\n"
 "kelias egzistuoja ir ar turi teises j� pasiekti."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�vesk %s slapta�od� (vartotojas %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "baigiasi su"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "El. pa�tas 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "I�sami..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kur� rodys Aplank� nar�ykl�"
 
@@ -760,7 +769,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adres� knygel�s �altinis"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -855,8 +864,8 @@ msgstr "Konfig�ravimas"
 msgid "Mappings"
 msgstr "Para�t�s"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_kas"
@@ -908,8 +917,8 @@ msgstr "Paie�kos _sritis: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Ie�koma"
 
@@ -1100,15 +1109,15 @@ msgid "Using email address"
 msgstr "El. pa�to adresas:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Prid�ti"
 
@@ -1154,12 +1163,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "K_eisti"
@@ -1274,10 +1283,10 @@ msgstr "Adres� knygel�s vard� pasirinkimo s�sajos gamykla"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Pa�alinti"
 
@@ -1306,33 +1315,15 @@ msgstr "(%d nerodom�)"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Pasirinkti kontaktus i� adres� knygel�s"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Rasti kontakt�"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Pasirinkti kontaktus i� adres� knygel�s"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Pasirink vardus"
@@ -1354,15 +1345,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Perkelti..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Aplankas:"
 
@@ -1476,11 +1462,12 @@ msgstr "Nori gauti _HTML lai�kus"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_I�trinti"
 
@@ -2717,7 +2704,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Pasl�pti adresus siun�iant lai�kus �iam s�ra�ui"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Pa�alinti"
 
@@ -2781,7 +2768,7 @@ msgstr ""
 "�iame aplanke. Ar nor�tum j� vis tiek prid�ti?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "I�sami paie�ka"
 
@@ -2809,21 +2796,21 @@ msgid "Error getting book view"
 msgstr "Klaida pradedant %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortel�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "S�km�"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Ne�inoma klaida"
 
@@ -2831,8 +2818,8 @@ msgstr "Ne�inoma klaida"
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Pri�jimas u�draustas"
 
@@ -2849,7 +2836,7 @@ msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2872,48 +2859,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "N�ra tokios bylos %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Ar nori i�saugoti pakeitimus?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Klaida pridedant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Klaida pridedant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Klaida pa�alinant s�ra��"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Klaida pa�alinant kortel�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vaizdavimas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vaizdavimas"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2921,22 +2913,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "N�ra korteli�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "N�ra korteli�"
@@ -3009,7 +3001,7 @@ msgstr "Adres� knygel�"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "I�saugoti kaip VCard"
 
@@ -3049,7 +3041,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot nuostatos..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persi�sti kontakt�"
 
@@ -3058,8 +3050,8 @@ msgid "Send Message to Contact"
 msgstr "Si�sti lai�k� kontaktui"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Spausdinti"
@@ -3079,7 +3071,7 @@ msgid "Move to folder..."
 msgstr "Perkelti � aplank�..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "I�kirpti"
 
@@ -3090,20 +3082,20 @@ msgid "Copy"
 msgstr "Kopijuoti"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�d�ti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "I�trinti"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Esamas vaizdas"
@@ -3275,7 +3267,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Parinktys"
 
@@ -3366,26 +3358,26 @@ msgstr "K_eisti �vyk�"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Auk�tas"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normalus"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "�emas"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Neapibr��tas"
@@ -3511,11 +3503,11 @@ msgstr "U�tildymo laikas (minut�mis)"
 msgid "_Edit appointment"
 msgstr "K_eisti �vyk�"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "N�ra jokios apra�ymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3527,13 +3519,13 @@ msgstr ""
 "si�st� lai�k�.  Evolution vietoj to parodys normal�\n"
 "u�uominos dialog�."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�sp�jimas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3544,7 +3536,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Kit� kart� nebeklausti."
@@ -3575,7 +3567,7 @@ msgstr "Apra�ymas turi savyje"
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Netinkantys"
 
@@ -3586,7 +3578,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
@@ -3608,19 +3600,19 @@ msgstr "%Y m. %B %d d."
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Negal�jau sukurti kalendoriaus rodinio. Patikrink, ar gerai �diegti ORBit ir "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Asmeni�kas"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Slaptas"
@@ -3645,37 +3637,37 @@ msgstr "R"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Laisvas"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "U�imtas"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Neprad�ta"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "U�baigta"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3686,56 +3678,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Taip"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dien� rodinys"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Darbo savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Savait�s rodinys"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "M�nesio rodinys"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalendorius"
 
@@ -3743,12 +3734,12 @@ msgstr "Kalendorius"
 msgid "Folder containing appointments and events"
 msgstr "Aplankas, kuriame saugomi �vykiai ir susitikimai"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "U�duotys"
 
@@ -3756,44 +3747,62 @@ msgstr "U�duotys"
 msgid "Folder containing to-do items"
 msgstr "Aplankas, kuriame yra u�duotys"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Naujas �vykis"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "�vykis"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Sukurti nauj� �vyk�"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Naujien� �altini� nuostatos"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Sukurti nauj� u�duot�"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_U�duotis"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Sukurti nauj� u�duot�"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Naujas �vykis"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Naujas �vykis"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "�vykis"
+msgid "Create a new all-day appointment"
+msgstr "Sukurti nauj� �vyk�"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3858,7 +3867,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dien�"
 
@@ -3866,11 +3876,13 @@ msgstr "dien�"
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "valand�"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minu�i�"
 
@@ -3998,7 +4010,7 @@ msgstr "U�uominos"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ap�valga:"
 
@@ -4027,7 +4039,7 @@ msgstr "�vykio pabaig�"
 msgid "hour(s)"
 msgstr "valand�(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut�(es)"
 
@@ -4205,7 +4217,7 @@ msgid "_Fri"
 msgstr "Pe_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Esm�"
 
@@ -4250,19 +4262,33 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "prie� �vykio prad�i�"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Susitikimo b�sena pasikeit�. Ar si�sti atnaujint� versij�?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �� susitikim�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �i� u�duot�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ar tu tikrai nori at�aukti ir i�trinti �� �urnalo �ra��?"
 
@@ -4332,61 +4358,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Negal�jau tvarkingai atnaujinti byl�"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Keisti �vyk�"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "�vykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "U�duotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "�urnalo �ra�as -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "N�ra ap�valgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nepavyko gauti esamos versijos!"
 
@@ -4589,7 +4615,7 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4601,7 +4627,7 @@ msgstr "Rol�"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "B�sena"
@@ -4686,7 +4712,7 @@ msgstr "lygiai"
 msgid "first"
 msgstr "s�ra�as"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund�"
 
@@ -4710,7 +4736,7 @@ msgstr "s�ra�as"
 msgid "Other Date"
 msgstr "Kitas faksas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "diena"
 
@@ -4810,20 +4836,26 @@ msgstr "% U�baigta"
 msgid "Date Completed:"
 msgstr "U�baigimo data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Reikalauja veiksmo"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Pa�anga"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Svarbumas:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_B�sena:"
 
@@ -4837,7 +4869,7 @@ msgstr "Esm�"
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4906,81 +4938,81 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "I�saugoti kaip..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_I�kirpti"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "�_d�ti"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priskirti u�duot�"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Pa�ym�ti u�baigta"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pa�ym�ti u�duotis u�baigtomis"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_I�trinti pa�ym�tas u�duotis"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Spausk �ia, kad prid�tum u�duot�"
@@ -4989,8 +5021,8 @@ msgstr "Spausk �ia, kad prid�tum u�duot�"
 msgid "Alarms"
 msgstr "Persp�jimai"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "U�baigta"
 
@@ -5018,11 +5050,9 @@ msgstr "Svarbumas"
 msgid "Start Date"
 msgstr "Prad�ios data"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Ap�valga"
 
@@ -5064,110 +5094,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr " "
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Naujas �_vykis"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos �vykis"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nauja u�duotis"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Spausdinti..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Eiti � �ia_ndien�"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Eiti � dat�..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfig�ruoti aplank�..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfig�ruoti aplank�..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "I�_saugoti kaip..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�traukti s_usitikim� � dienotvark�"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Persi�sti kaip i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Leisti per_kelti �� pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "I�trinti �� _pasitaikym�"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "I�trinti _visus pasitaikymus"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Atrodo, kad GNOME Pilot �rankiai n�ra �diegti � �i� sistem�"
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
@@ -5217,7 +5246,7 @@ msgstr " (U�baigta "
 msgid "Task Due: <b>"
 msgstr " (U�baigta "
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "kalendoriaus informacija"
@@ -5228,361 +5257,368 @@ msgstr "kalendoriaus informacija"
 msgid "iCalendar Error"
 msgstr "Kalendorius"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "ne�inomas siunt�jas"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Geogr. vietov�: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_B�sena:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ne�inomas"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Pasirink veiksm�"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Gerai"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Su�inoti naujausi� susitikimo informacij�"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Ie�koti lai�ke"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Informacija"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Susitikimas"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "buvo po"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "Atsakyti"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Gauti naujausi� informacij� apie u�duot�"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Nutraukti veiksm�"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "_Laisvas-u�si�m�s URL"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Praeit� lai�k�"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�vyko klaida parsiun�iant naujien� �altin�"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Atnaujinimas u�baigtas\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendoriaus byla negal�jo b�ti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio b�sena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Pa�alinimas u�baigtas"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Elementas i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Elementas negal�jo b�ti i�si�stas!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Pasirink aplank�"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Pasirink aplank�"
@@ -5628,7 +5664,7 @@ msgstr "prad�ios-data"
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "B�tini dalyviai"
 
@@ -5641,57 +5677,52 @@ msgid "Non-Participants"
 msgstr "Ne dalyviai"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individas"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grup�"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Resursas"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Kambarys"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Pirmininkas"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "B�tinas dalyvis"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Neb�tinas dalyvis"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Reikalauja veiksmo"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Negalutinis"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Pavestas"
 
@@ -5781,49 +5812,46 @@ msgstr "Susitikimo _prad�ios laikas:"
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos u�duotys i� %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Negal�jau �kelti u�duo�i� � �%s�"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas �kelti �%s�, nepalaikomas"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Negal�jau atidaryti aplanko su �%s�"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "U�baigimo data"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "I�valyti"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Naujas �_vykis..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_I�trinti �� �vyk�"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5834,11 +5862,16 @@ msgstr "Negal�jau atidaryti aplanko su �%s�"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metodas, reikalingas atidaryti �%s�, nepalaikomas"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atidaromas kalendorius i� %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Atidaromas aplankas %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -5895,59 +5928,64 @@ msgstr "Spalis"
 msgid "September"
 msgstr "Rugs�jis"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Turi b�ti nurodytas organizatorius."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Informacija"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Neb�tina informacija"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "_Skelbti laisvas/u�imtas informacij�"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "kalendoriaus informacija"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Data"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Atnaujinti s�ra��"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Tu turi b�ti �vykio dalyvis."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Negal�jau inicializuoti Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
@@ -6179,9 +6217,8 @@ msgid "Print Calendar"
 msgstr "Spausdinti kalendori�"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Spaudinio per�i�ra"
 
@@ -6218,8 +6255,8 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Kit� kart� nebeklausti."
 
@@ -6281,17 +6318,29 @@ msgstr "Importuoja VCard bylas � Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuoja VCard bylas � Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Negaliu gauti lai�ko: %s i� aplanko %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Negal�jau prisijungti prie serverio: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "U�uomina"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendoriaus �inut�"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6300,112 +6349,112 @@ msgstr ""
 "Evolution rado Pine pa�to byl�.\n"
 "Ar nor�tum jas importuoti � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Atidaryti kalendori�"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now tikisi 0 argument�"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? tikisi 0 argument�"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? tikisi 1 argumento"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? tikisi, kad pirmas argumentas bus time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Paie�kos i�rai�kos �vertinimas nedav� login�s reik�m�s"
 
@@ -8062,72 +8111,82 @@ msgstr "�ra�omas aplankas '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Tu turi dirbti prisijung�s, kad u�baigtum �� veiksm�"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrin�jant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtr�: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas lai�kas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nes�km� ties lai�ku %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Blogi argumentai"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Blogi argumentai"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paie�k�: %s: %s"
@@ -8187,7 +8246,7 @@ msgstr "Perkeliami lai�kai"
 msgid "Copying messages"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8195,47 +8254,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netik�tas atsakymas i� POP serverio: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Nenurodytas aplanko vardas."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Negaliu u��ifruoti �io lai�ko: nenurodyti jokie gav�jai."
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8243,18 +8302,18 @@ msgid ""
 "%.*s"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nepavyko i�koduoti lai�ko."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Negal�jau sukurti laikinos bylos: %s"
@@ -8280,22 +8339,22 @@ msgid "Could not lock '%s'"
 msgstr "Negal�jau u�rakinti '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Negal�jau sukurti %s u�rakto bylos: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Baig�si laikas, belaukiant %s u�rakto bylos. Bandyk v�liau."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti u�rakto naudojant flock(2): %s"
@@ -8354,11 +8413,15 @@ msgstr "Klaida �ra�ant laikin� pa�to byl�: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Klaida kopijuojant laikin� pa�to byl�: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8487,7 +8550,7 @@ msgid ""
 msgstr "Negal�jau sukurti pipe: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
@@ -8665,31 +8728,130 @@ msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Nepavyko patikrinti sertifikat�."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Nepavyko patikrinti sertifikat�."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Blogas sertifikatas i� %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Ar nori priimti vis tiek?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Para�o byla:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Klaida �keliant %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Nesu darbe"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nepavyko patikrinti sertifikat�."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Blogas argumentas"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8698,16 +8860,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Blogas sertifikatas i� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Ar nori priimti vis tiek?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8727,32 +8906,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Negal�jau i�nagrin�ti URL �%s�"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Klaida pradedant %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�ra tokio lai�ko %s aplanke %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu i�trinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
@@ -8760,12 +8944,12 @@ msgstr "Negaliu pervadinti aplanko: %s: N�ra tokio aplanko"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netik�tai atsijung�: %s"
@@ -8794,40 +8978,40 @@ msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Netik�tas atsakymas OK i� IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Negal�jau sukurti katalogo %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko �kelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Aplankas serveryje buvo sunaikintas ir v�l sukurtas."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Ie�koma pakeist� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "�is lai�kas �iuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 
@@ -8836,10 +9020,10 @@ msgstr "Negal�jau rasti lai�ko teksto FETCH atsakyme"
 msgid "Could not open cache directory: %s"
 msgstr "Negal�jau atidaryti ke�o katalogo: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nepavyko i�koduoti lai�ko."
@@ -8852,7 +9036,7 @@ msgstr "Tikrinama, ar yra nauj� lai�k�"
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Aplankai"
 
@@ -8882,7 +9066,7 @@ msgstr "Pa�to skaitymui ir ra�ymui IMAP serveriuose."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Slapta�odis"
 
@@ -8892,73 +9076,77 @@ msgstr ""
 "Su �ia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slapta�odis."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Veiksmas nepalaikomas"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentikacija nepavyko."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Aplankas n�ra tu��ias"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Tu ne�vedei slapta�od�io."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8968,31 +9156,37 @@ msgstr ""
 "Negal�jau autentikuotis � IMAP server�.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "N�ra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Aplanko varde negali b�ti Return simbolio."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "T�vinis aplankas negali tur�ti vaikini� aplank�"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Negaliu atidaryti pa�to d��ut�s: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9014,7 +9208,10 @@ msgid "Local delivery"
 msgstr "Vietinis pristatymas"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Pa�to gavimui i� standartini� mbox formato byl�."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9042,12 +9239,12 @@ msgstr "Standartin�s Unix mbox bylos"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Vietinio pa�to skaitymui ir laikymui standartin�se mbox bylose"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9058,38 +9255,38 @@ msgstr "Saugyklos �aknis %s n�ra absoliutus kelias"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Vietin�se saugyklose n�ra inbox"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Vietin� pa�to byla %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Negal�jau i�trinti aplanko indekso bylos �%s�: %s"
@@ -9150,7 +9347,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9190,26 +9387,26 @@ msgstr ""
 "Negal�jau sukurti aplanko: �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Negaliu atidaryti maildir katalogo kelio: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Tikrinama, ar yra nauj� lai�k�"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Ie�koma nauj� lai�k�"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "�ra�omas aplankas"
@@ -9254,7 +9451,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9263,7 +9460,7 @@ msgstr ""
 "Negal�jau atidaryti bylos �%s�: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9272,14 +9469,14 @@ msgstr ""
 "Negal�jau sukurti bylos �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "�%s� n�ra paprasta byla."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9288,7 +9485,7 @@ msgstr ""
 "Negal�jau i�trinti aplanko �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas �%s� n�ra tu��ias. Nei�tryniau."
@@ -9303,64 +9500,64 @@ msgstr "Negal�jau atidaryti aplanko: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Negal�jau patikrinti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Negal�jau atidaryti bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Negal�jau atidaryti laikinos pa�to bylos: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Negal�jau u�daryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santrauka ir aplankas nesutampa net po sinchronizavimo"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ne�inoma klaida: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Negal�jau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nepavyko ra�yti � laikin� pa�to d��ut�: %s: %s"
@@ -9510,50 +9707,50 @@ msgstr "Nutraukti"
 msgid "Operation failed: %s"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Parsiun�iama POP santrauka"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Veiksmas nutrauktas"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Negal�jau gauti aplanko �%s�: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Sunaikinami i�trinti lai�kai"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�ra lai�ko su uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Parsiun�iamas POP lai�kas %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Negaliu gauti lai�ko: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Ne�inoma klaida"
@@ -9571,7 +9768,7 @@ msgstr "Palikti lai�kus serveryje"
 msgid "Delete after %s day(s)"
 msgstr "I�trinti po %s dienos(�)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9598,6 +9795,11 @@ msgstr ""
 "slapta�odis per APOP protokol�. Tai gali veikti ne visiems vartotojams netgi "
 "serveriuose, kurie teigia, jog j� palaiko."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Negal�jau prisijungti prie %s (prievadas %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9609,54 +9811,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko pra�yto autentikacijos mechanizmo."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/O klaida"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Negal�jau autentikuotis � KPOP server�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPra�om �vesti POP3 slapta�od� d�l %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant slapta�od�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "N�ra tokio aplanko �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9682,35 +9886,35 @@ msgstr "Negal�jau sukurti pipe � sendmail: %s: pa�tas nei�si�stas"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Negal�jau i�si�sti lai�ko: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail'as baig� darb� signalu %s: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Negal�jau paleisti %s: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail'as baig� darb� b�sena %d: pa�tas nei�si�stas."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9821,45 +10025,45 @@ msgstr "Laikina autentikacijos nes�km�"
 msgid "Authentication required"
 msgstr "Autentikacija b�tina"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Atsakymo � pasisveikinim� klaida: %s: galb�t nelemtinga"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Negal�jau prisijungti prie POP serverio.\n"
 "Klaida siun�iant vartotojo vard�: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP serveris %s nepalaiko pra�yto autentikacijos tipo %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPra�om �vesti SMTP slapta�od� d�l %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9869,90 +10073,90 @@ msgstr ""
 "Negal�jau autentikuotis � SMTP server�.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pa�to siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Siun�iamas lai�kas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Negaliu si�sti lai�ko: neapibr��ti jokie gav�jai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Baig�si HELO u�klausos laiko riba: %s: nelemtinga"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO atsakymo klaida: %s: nelemtinga"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET atsakymo klaida: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objekt�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH u�klausa nepavyko."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas i� serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Baig�si MAIL FROM u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM atsakymo klaida: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Baig�si RCPT TO u�klausos laiko riba: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
@@ -9960,91 +10164,91 @@ msgstr "Baig�si DATA u�klausos laiko riba: %s: pa�tas nei�si�stas"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Baig�si DATA siuntimo laiko riba: lai�ko nutraukimas: %s: pa�tas nei�si�stas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Blogas autentikacijos atsakymas i� serverio."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Baig�si RSET u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Baig�si QUIT u�klausos laiko riba: %s: nelemtinga"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Baig�si AUTH u�klausos laiko riba: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atsakymo klaida: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 baitas"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bait�"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 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:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Prisegti pried�..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Prisegti byl� prie �io lai�ko"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Negal�jau prisegti bylos %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Negaliu prisegti bylos %s: ne paprasta byla"
@@ -10062,56 +10266,60 @@ msgid "MIME type:"
 msgstr "MIME tipas:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Pasi�lyti automatin� priedo parodym�"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Paspausk �ia, jei reikia adres� knygel�s"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Nuo:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Nuo:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "�vesk lai�ko gav�jus"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "�vesk adresus, kurie gaus �io lai�ko carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10119,17 +10327,25 @@ msgstr ""
 "�vesk adresus, kurie gaus �io lai�ko carbon copy, bet j� nesimatys lai�ko "
 "gav�j� s�ra�e."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "_Prievadas:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Prisegti byl�"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10138,34 +10354,34 @@ msgstr ""
 "Klaida skaitant byl� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�sp�jimas!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Byla egzistuoja, u�ra�yti?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida i�saugant byl�: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida �keliant byl�: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Klaida prieinant prie bylos: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nepavyko gauti lai�ko i� redaktoriaus"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10174,7 +10390,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10183,7 +10399,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10192,7 +10408,7 @@ msgstr ""
 "Klaida automati�kai i�saugant lai�k�: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10200,7 +10416,7 @@ msgstr ""
 "Ximian Evolution rado nei�saugot� byl� i� praeitos sesijos.\n"
 "Ar nor�tum pabandyti jas atkurti?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10210,49 +10426,45 @@ msgstr ""
 "\n"
 "Ar nor�tum i�saugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Atidaryti byl�"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "�terpti byl�"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "I�saugoti para��"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (�prasta)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Sukurti lai�k�"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10260,9 +10472,9 @@ msgstr ""
 "Negal�jau sukurti ra�ykl�s lango:\n"
 "Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10327,8 +10539,8 @@ msgstr "Tema savyje turi"
 msgid "Subject does not contain"
 msgstr "Tema savyje neturi"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10336,12 +10548,11 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "U�ra�yti j�?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
 
@@ -10440,149 +10651,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "metai"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "met�"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekund�i�"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�nesis"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut�"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "m�nesi�"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "valanda"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "savait�"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "savai�i�"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "valanda"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�nesis"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut�"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "m�nesi�"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekund�i�"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "metai"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "met�"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Tu u�mir�ai pasirinkti dat�."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Tu pasirinkai blog� dat�."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Lai�ko data bus palyginta su esamu laiku, kai\n"
-"paleid�iamas filtras ar atidaromas vAplankas."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Lai�ko data bus palyginta su laiku,\n"
-"kur� tu nurodai �ia."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Lai�ko data bus palyginta su laiku, santykiniu\n"
-"filtro paleidimo laikui;\n"
-"pavyzd�iui, �prie� savait�."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "esamas laikas"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "tavo nurodytas laikas"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "laikas, santykinis esamam laikui"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Pasirink laik�, su kuriuo palyginti"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Palyginti su"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<spausk �ia, kad pasirinktum dat�>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "dabar"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " "
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %Y %b %d"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr " "
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %H:%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<spausk �ia, kad pasirinktum dat�>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Pasirink laik�, su kuriuo palyginti"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtravimo taisykl�s"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stiliaus vardas:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool'as �%s� neegzistuoja arba n�ra paprasta byla."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Pasirink veiksm�"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Tada"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Prid�ti veiksm�"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10590,12 +10752,12 @@ msgstr ""
 "Tu pamir�ai pasirinkti aplank�.\n"
 "Pra�au, gr��k atgal ir nurodyk tikr� aplank�, � kur� perkelti lai�kus."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Pasirink aplank�"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10604,93 +10766,168 @@ msgstr ""
 "Klaida reguliarioje i�rai�koje �%s�:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Svarbus"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Dirbama"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togas"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Bandyti"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Taisykl�s pavadinimas:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Bevard�"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Jeigu"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "�vykdyti veiksmus"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "jei visos s�lygos tenkinamos"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "jei kuri nors s�lyga tenkinama"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Prid�ti s�lyg�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "gaunamas"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "siun�iamas"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Palyginti su"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Keisti filtrus"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Keisti vAplankus"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Gaunamas"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Siun�iamas"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Lai�ko data bus palyginta su laiku,\n"
+"kur� tu nurodai �ia."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Lai�ko data bus palyginta su laiku, santykiniu\n"
+"filtro paleidimo laikui;\n"
+"pavyzd�iui, �prie� savait�."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Lai�ko data bus palyginta su laiku,\n"
+"kur� tu nurodai �ia."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtual�s aplankai"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "laikas, santykinis esamam laikui"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr " "
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tik nurodyti aplankai"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "esamas laikas"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "tavo nurodytas laikas"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vAplank� �altiniai"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "su visais aktyviais nutolusiais aplankais"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "su visais vietiniais aplankais"
 
@@ -10718,42 +10955,42 @@ msgid "Beep"
 msgstr "Belizas"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Kompanijos"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "turi savyje"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopijuoti � aplank�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "I�trintas"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "neturi savyje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nesibaigia"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "neegzistuoja"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neegzistuoja"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "neskamba pana�iai �"
@@ -10775,91 +11012,87 @@ msgid "ends with"
 msgstr "baigiasi su"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "egzistuoja"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "I�rai�ka"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Svarbus"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "buvo po"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "buvo prie�"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "yra didesnis u�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "yra ma�esnis u�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "n�ra"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Konferencija"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Lai�ko tekstas"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Lai�ko antra�t�"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Perkelti � aplank�"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Si�sti lai�k� kontaktui"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Groti gars�:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Skaitytas"
 
@@ -10875,57 +11108,87 @@ msgstr "Regex tenkina"
 msgid "Replied to"
 msgstr "Atsakytas"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Darb"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "yra didesnis u�"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "yra ma�esnis u�"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "�vertis"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Siunt�jas"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Priskirti b�sen�"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Kompanijos"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Dydis (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "skamba pana�iai �"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�altinio s�skaita"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Savita antra�t�"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "prasideda su"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdym�"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Priskirti b�sen�"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Taisykl�s"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Prid�ti taisykl�"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Keisti taisykl�"
 
@@ -10933,12 +11196,12 @@ msgstr "Keisti taisykl�"
 msgid "Score Rules"
 msgstr "�ver�io taisykl�s"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 
@@ -10946,31 +11209,31 @@ msgstr "Tu turi nurodyti bent vien� aplank� kaip �altin�"
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo sen� Elm pa�t�"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importuojama..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Pra�ome palaukti"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importuojama %s kaip %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Skanuojama %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Pa�tas"
 
@@ -11031,39 +11294,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�iuk�l�s"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Vietin� pa�to byla %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Skanuojamas katalogas"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Pradedama importuoti"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Keisti filtrus"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11146,12 +11409,12 @@ msgstr "Pa�to ap�valgos komponento gamykla."
 msgid "Font Preferences"
 msgstr "Kalendoriaus nuostatos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Pa�to s�skaita"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Kalendoriaus nuostatos"
@@ -11200,66 +11463,86 @@ msgstr "Savyb�s..."
 msgid "Change this folder's properties"
 msgstr "Pakeisti �io aplanko savybes"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei pa�to siuntimo metodo"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "�sp�jimas: Pakeistas lai�kas"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Naujas pa�to lai�kas"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Pa�to lai�kas"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sukurti lai�k�"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Kit� lai�k�"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "S_pausdinti lai�k�"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Naujas pa�to lai�kas"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Negaliu inicializuoti Evolution pa�to komponento."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Negaliu u�registruoti saugyklos apvalkale"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�%s� savyb�s"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Savyb�s"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
@@ -11309,135 +11592,135 @@ msgstr "%d i� viso"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _virtual� aplank� i� lai�ko"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Tem�"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_nt�j�"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gav�jus"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferencij�"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_em�"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_unt�j�"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_v�jus"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferencij�"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip nauj� lai�k�..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siunt�jui"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Atsakyti � _konferencij�"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "P_ersi�sti"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "U�baigta"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "I�valyti"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Pa�ym�ti s_kaitytu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Pa�ym�ti _neskaitytu"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Pa�ym�ti svarb_iu"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Pa�ym�ti nesva_rbiu"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "S_ugr��inti"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti � aplank�..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Prid�ti siunt�j� � adres� knygel�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Pritaikyti filtrus"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Sukurti _taisykl� i� lai�ko"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "vAplankas pagal Konferencij�"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtras pagal Konferencij� (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vAplankas pagal Konferencij� (%s)"
@@ -11502,76 +11785,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution naujien� tvarkykl�"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution s�skait� tvarkykl�"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Vartotojo vardas:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Tu negali sukurti dviej� aplank� tuo pa�iu vardu."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tu tikrai nori i�trinti �i� s�skait�?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nei�trinti"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Ar tikrai i�trinti s�skait�?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "I�jungti"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "�jungti"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "�jungta"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_S�skaitos vardas:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rikas"
@@ -11581,30 +11855,30 @@ msgstr "Puerto Rikas"
 msgid "Mail to %s"
 msgstr "Lai�kai � %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Lai�kai nuo %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Prid�ti filtro taisykl�"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11616,7 +11890,7 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11628,7 +11902,7 @@ msgstr ""
 "gauti ir ra�yti lai�kus.\n"
 "Ar nor�tum sutvarkyti j� dabar?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11636,7 +11910,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenyb�,\n"
 "tik tada gal�si kurti lai�kus."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11645,7 +11919,7 @@ msgstr ""
 "tik tada gal�si kurti lai�kus."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11653,11 +11927,11 @@ msgstr ""
 "Tu siunti HTML formatuot� lai�k�, bet sekantys gav�jai nem�gsta HTML "
 "formatuoto pa�to:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Si�sti vistiek?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11665,7 +11939,7 @@ msgstr ""
 "�is lai�kas neturi temos.\n"
 "Tikrai si�sti?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11673,11 +11947,11 @@ msgstr ""
 "Kadangi kontakt� s�ra�as, kuriam tu siunti, yra sukonfig�ruotas sl�pti "
 "s�ra�o adresus, �iame lai�ke bus tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "�iame lai�ke yra tik Bcc gav�jai."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11685,15 +11959,11 @@ msgid ""
 "Send anyway?"
 msgstr "Gali b�ti, kad pa�to serveris"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gav�jus, kad gal�tum i�si�sti �� lai�k�."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Tu turi susitvarkyti s�skait�, tik tada gal�si i�si�sti �� lai�k�."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11701,28 +11971,28 @@ msgstr ""
 "Nepavyko atidaryti �ios s�skaitos juodra��i� aplanko.\n"
 "Ar nor�tum naudoti �prastin� juodra��i� aplank�?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "ne�inomas siunt�jas"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M, %%s ra��:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Perkelti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopijuoti lai�k�(us) �"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ar tu tikrai nori taisyti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11730,7 +12000,7 @@ msgstr ""
 "Tu gali taisyti tik lai�kus, esan�ius \n"
 "Juodra��i� aplanke."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11738,39 +12008,39 @@ msgstr ""
 "Tu gali i� naujo pasi�sti lai�kus\n"
 "tik i� Sent aplanko."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ar tu tikrai nori v�l si�sti visus %d lai�kus?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Joks lai�kas nepa�ym�tas"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "U�ra�yti byl�?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "I�saugoti lai�k� kaip..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "I�saugoti lai�kus kaip..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parodyti kit� neskaityt� lai�k�"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11782,7 +12052,7 @@ msgstr ""
 "\n"
 "Tikrai i�trinti tuos lai�kus?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11791,28 +12061,28 @@ msgstr ""
 "Klaida, �keliant filtro informacij�:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Gaunamas lai�kas %d i� %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Spausdinti lai�k�"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti lai�ko"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ar tu tikrai nori atidaryti visus %d lai�kus atskiruose languose?"
@@ -11833,7 +12103,7 @@ msgstr "apra�ymas"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Bevardis kontaktas"
@@ -11854,20 +12124,21 @@ msgid "Add Signature"
 msgstr "I�saugoti para��"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Pra�au �vesti savo vard� ir elektroninio pa�to adres� �emiau. \"Neb�tini\" "
 "laukai �emiau gali likti tu�ti,\n"
 "nebent tu nori �traukti �i� informacij� tavo siun�iamuose lai�kuose."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Pra�om �emiau �vesti informacij� apie tavo gaunamo pa�to server�. Jei tu "
 "gerai ne�inai, paklausk savo sistemos administratoriaus arba interneto "
@@ -11878,24 +12149,23 @@ msgid "Please select among the following options"
 msgstr "Pra�om pasirinkti i� �emiau esan�i� parink�i�"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Pra�om �emiau �vesti informacij� apie tavo siun�iamo pa�to server�. Jei tu "
 "gerai ne�inai, paklausk savo sistemos administratoriaus arba interneto "
 "paslaug� teik�jo."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Tu jau beveik baigei konfig�ruoti savo pa�t�. Asmenyb�, gaunamo pa�to "
 "serveris bei pa�to siuntimo metodas, kuriuos tu �vedei, bus sugrupuoti � "
@@ -11903,43 +12173,20 @@ msgstr ""
 "�emiau esan�iame laukelyje. �is pavadinimas bus naudojamas tik vaizdavimui."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution s�skait� pad�j�jas"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Dirbama"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togas"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "po"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "S�skaita"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Tikrinama paslauga"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
@@ -12203,228 +12450,216 @@ msgstr "I�saugoti ir u�daryti"
 msgid "Loading Images"
 msgstr "�kelt_i paveiksl�lius"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Pa�to d��ut�s vieta"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Lai�ko antra�t�"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Lai�ko rodymas"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP serveris:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pa�to nustatymas"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Serveriai"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Neb�tina informacija"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Pasirink spalv�"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Spausdinti pa�ym�tus kontaktus"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Negaliu atidaryti lai�ko"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Prisi_minti �� slapta�od�"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Atsakyti-kam:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Gavimo nuostatos"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Prisiminti �� slapta�od�"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "B�tina informacija"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "�p_rastas"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Saugumas"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Pasirink PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "I�si�st� _lai�k� aplankas:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "I�si�sti lai�kai ir juodra��iai"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverio nustatymas"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Trump�s"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "I�saugoti para��"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "I�saugoti para��"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "�altinis"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "�altinio informacija"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stiliaus vardas:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standartin� Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -12433,12 +12668,12 @@ msgstr ""
 "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
 "�Namai� ar �Darbas�."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12448,205 +12683,201 @@ msgstr ""
 "\n"
 "Spausk �Pirmyn�, kad prad�tum."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Ryt�"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Vis_ada �kelti paveiksl�lius i� tinklo"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentikacijos tipas: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automati�kai tikrinti pa�t� kas"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Patvirtinti aplank� i�valym�"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "�p_rastas"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "�jungti"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Persi�sti kaip"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilnas vardas:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML lai�kuose"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Asmenyb�"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "�ke_lti paveiksl�lius, jei siunt�jas yra adres� knygel�je"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Pa_daryti �i� s�skait� �prastine"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Pa�ym�ti lai�kus skaitytais po"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Niekada ne�kelti paveiksl�li� i� tinklo"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP u��ifruoti"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Paklausti, kai siun�iamas HTML lai�kas kontaktams, kurie j� nenori"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prie� siun�iant lai�kus su _tu��ia tema"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Pa�to gavimas"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atsakyti visiems"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pa�to siuntimas"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Rodyti laik� kaip"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML para�as:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Naudoti s_augi� jungt� (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Kintamos krypties"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_kas"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " spalva"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "apra�ymas"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12672,116 +12903,126 @@ msgstr "Negal�jau sukurti ra�ykl�s lango."
 msgid "Could not create a S/MIME decode context."
 msgstr "Negal�jau sukurti ra�ykl�s lango."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Negal�jau sukurti laikino katalogo: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "I�saugoti � disk�..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "I�saugoti pried�"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "�i�r�ti viduje"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�i�r�ti viduje (per %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Sl�pti"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "I�orin� �i�rykl�"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "�kelt_i paveiksl�lius"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�keliamas lai�ko turinys"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "_V�luojamos u�duotys:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %H:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Nuorod� atidaryti nar�ykl�je"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopijuoti nuorodos adres�"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "I�saugoti nuorod� kaip (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "I�saugoti paveiksl�l� kaip..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Negal�jau i�nagrin�ti MIME lai�ko. Rodomas �altinis."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Blogas adresas"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Nuo"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Atsakyti-kam"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pa�to programa: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "I�saugoti lai�k� kaip..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
@@ -12789,94 +13030,94 @@ msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Negal�jau prisijungti prie POP serverio %s."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, patikrinus nustatyta, kad "
 "jis autenti�kas"
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "�is lai�kas yra pasira�ytas skaitmeniniu para�u, bet neina patikrinti, ar "
 "jis autenti�kas"
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodykl� � FTP svetain� (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodykl� � vietin� byl� (%s), galiojanti svetain�je �%s�"
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodykl� � vietin� byl� (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodykl� � nutolusius duomenis (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodykl� � ne�inomus i�orinius duomenis (�%s� tipo)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 #, fuzzy
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota i�orinio k�no dalis."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Ypatingi aplankai"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "I� naujo konfig�ruojamas aplankas"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Negaliu i�saugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti �io aplanko: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Negaliu sukurti aplanko u�rakto ant %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Negal�jau i�trinti aplanko:\n"
 "%s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Kei�iamas aplanko �%s� formatas � �%s�"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s negalima perkonfig�ruoti, nes tai n�ra vietinis aplankas"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12884,16 +13125,16 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti �ios pa�to\n"
 "d��ut�s, tau teks sutaisyti j� rankut�mis."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Tu negali pakeisti nevietinio aplanko formato."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "V�l konfig�ruoti %s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12902,7 +13143,7 @@ msgstr ""
 "Klaida �%s� metu:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12911,7 +13152,7 @@ msgstr ""
 "Klaida vykdant veiksm�:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Dirbama"
 
@@ -12919,100 +13160,100 @@ msgstr "Dirbama"
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Gaunamas pa�tas"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Ta�iau lai�kas buvo s�kmingai i�si�stas."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Siun�iamas �%s�"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas lai�kas %d i� %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Nes�km� ties lai�ku %d i� %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "U�baigta."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Lai�kas i�saugomas � aplank�"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Lai�kai perkeliami � %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Lai�kai kopijuojami � %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys �%s�"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Persi�sti lai�kai"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "�ra�omas aplankas '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "I�valomas aplankas"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas lai�kas %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Gaunami %d lai�kai"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "I�saugomi %d lai�kai"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13021,7 +13262,7 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13030,11 +13271,11 @@ msgstr ""
 "Klaida i�saugant lai�kus �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "I�saugomas priedas"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13043,27 +13284,22 @@ msgstr ""
 "Negaliu sukurti i�vesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negal�jau �ra�yti duomen�: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "V�l jungiamasi prie %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Ie�koti"
 
@@ -13118,32 +13354,41 @@ msgstr "Kelias: %s, tipas: %s"
 msgid "Type: %s"
 msgstr "Tipas: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas pa�tas"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Nutraukti visus"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Vartotojas nutrauk� veiksm�."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Prisiminti �� slapta�od�"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Prisiminti �� slapta�od� iki �ios sesijos galo"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "�vesk %s slapta�od�"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "�vesk slapta�od�"
 
@@ -13173,7 +13418,7 @@ msgstr ""
 "Pasirink pavadinim�, kuriuo nor�tum vadinti �iuos serverius. Pavyzd�iui, "
 "�Namai� ar �Darbas�."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -13203,7 +13448,7 @@ msgstr "Persi�stas lai�kas - %s"
 msgid "Forwarded message"
 msgstr "Persi�stas lai�kas"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Persi�stas lai�kas"
 
@@ -13217,7 +13462,7 @@ msgstr "Kuriamas aplankas %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13230,95 +13475,98 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Aplankai"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Keisti vAplank�"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Bandoma keisti neegzistuojant� vAplank� '%s'."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(N�ra temos)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Lai�kas"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematyt� lai�k�"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Keletas lai�k�"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "�emiausias"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "�emesnis"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Auk�tesnis"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Auk��iausias"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "�iandien %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %H:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Generuojamas lai�k� s�ra�as"
 
@@ -13352,47 +13600,47 @@ msgstr "Gautas"
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Atsakiklis"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Eiti pirmyn"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "�altinio informacija"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Persi�sti"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Atsakyti visiems"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Per�i�ra"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13416,16 +13664,16 @@ msgstr "U�sakomas aplankas �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atsisakoma aplanko �%s�"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Aplankas"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Pra�om pasirinkti server�."
 
@@ -18331,11 +18579,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24319,8 +24567,8 @@ msgstr "apra�ymas"
 msgid "Mail summary"
 msgstr "Pa�to ap�valga"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "Ypatingi aplankai"
@@ -24339,15 +24587,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienos �odis"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Dienos citatos"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Prid�ti naujien� �altin�"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "�vesk URL naujien� �altinio, kur� nori prid�ti"
 
@@ -24359,26 +24607,26 @@ msgstr "Klaida parsiun�iant RDF"
 msgid "News Feed"
 msgstr "Naujien� �altinis"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Visi"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Pri_d�ti"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sniegas"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "N�ra u�duo�i�"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(N�ra apra�ymo)"
 
@@ -25660,7 +25908,8 @@ msgid "Tasks "
 msgstr "U�duotys "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Or� nuostatos"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25717,7 +25966,7 @@ msgstr "Rodyti detales"
 msgid "Cancel Operation"
 msgstr "Nutraukti veiksm�"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25731,21 +25980,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Prid�ti vAplanko taisykl�"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Juodra�tis"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gauti lai�kai"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Siun�iami lai�kai"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Matytas"
@@ -25972,22 +26221,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution -- Sukurti nauj� aplank�"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Pasirinkto aplanko tipas yra netinkamas\n"
-"pra�yt�jam veiksmui."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Sukurti _nauj� aplank�..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Naujas..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
@@ -26010,7 +26252,7 @@ msgstr ""
 "Gali pasirinkti �Automati�kas� jei tu ne�inai, ir Evolution bandys "
 "susigaudyti pati."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 #, fuzzy
 msgid "Please select the information that you would like to import:"
 msgstr "Pra�om pasirinkti informacij�, kuri� nor�tum importuoti"
@@ -26042,22 +26284,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "N�ra tokios bylos %s"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Tu gali importuoti tiktai � lokalius aplankus"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26066,11 +26304,11 @@ msgstr ""
 "N�ra importerio, kuris gal�t� suprasti\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importuojama"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26079,17 +26317,17 @@ msgstr ""
 "Importuojama %s.\n"
 "Pradedama %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Klaida pradedant %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Klaida �keliant %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26098,31 +26336,31 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automati�kas"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Pasirink byl�"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Bylos tipas:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importuoti duomenis ir nuostatas i� kit� program�"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importuoti vien� byl�"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26130,24 +26368,24 @@ msgstr ""
 "Pra�ome palaukti...\n"
 "Ie�koma esam� nustatym�"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Pasirink aplank�"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Pasirink aplank�, � kur� importuoti �iuos duomenis"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importuoti"
 
@@ -26193,9 +26431,14 @@ msgstr "Atidaromas aplankas %s"
 msgid "in \"%s\" ..."
 msgstr "Atidaryti su %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Negal�jau pervadinti aplanko: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Negaliu sukurti nurodyto aplanko:\n"
 "%s"
@@ -26212,8 +26455,8 @@ msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Negal�jau inicializuoti Evolution apvalkalo."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nauja"
@@ -26255,59 +26498,60 @@ msgstr "Eiti � aplank�..."
 msgid "Select the folder that you want to open"
 msgstr "Pasirink aplank�, kur� nor�tum atidaryti"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Sukurti nauj� trump�"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Pasirink aplank� � kur� nor�tum, kad trump� rodyt�:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Jokio)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dabar yra prisijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "atsijungus."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dabar yra atsijungusi.  Paspausk �� mygtuk�, kad dirbtum "
 "prisijungus."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26319,12 +26563,12 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26332,31 +26576,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Negaliu u�siregistruoti OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfig�racijos duombaz� nerasta"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Grup�s pavadinimas:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26365,108 +26609,118 @@ msgstr ""
 "Ar tu tikrai nori pa�alinti grup�\n"
 "�%s� i� trumpi� juostos?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nepa�alinti"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Pervadinti trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Pervadinti pasirinkt� trumpi� grup� �:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Ma�os ikonos"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Rodyti trumpes kaip ma�as ikonas"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Didel�s ikonos"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Rodyti trumpes kaip dideles ikonas"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nauja grup�..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Sukurti nauj� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Pa�alinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Pa�alinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Pervadinti �i� grup�..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Pervadinti �i� trumpi� grup�"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Pasl�pti trumpi� juost�"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Sukurti nauj� trump�"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Sukurti nauj� trump�"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Pervadinti trump�"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Pervadinti pasirinkt� trump� �:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Atidaryti aplank�, susiet� su �ia trumpe"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Atidaryti naujame _lange"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Atidaryti esam� lai�k� naujame lange"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Pervadinti �i� trump�"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "I�_trinti"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Pa�alinti �i� trump� i� trumpi� juostos"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Klaida i�saugant trumpes."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Trump�s"
 
@@ -26474,55 +26728,55 @@ msgstr "Trump�s"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "N�ra klaid�"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat pavadinimu"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Neu�tenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Aplankas n�ra tu��ias"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ne�gyvendinta �ioje saugykloje"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas �ioje saugykloje nepalaikomas"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nurodytas aplankas negali b�ti pakeistas ar i�trintas"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Negalima padaryti aplanko vaiku vienu i� savo palikuoni�"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Negaliu sukurti aplanko su tokiu vardu"
 
@@ -26577,64 +26831,64 @@ msgstr ""
 "Klaida i� aktyvavimo sistemos yra:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA klaida"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Pertraukta"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Blogas argumentas"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Jau turi savinink�"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "N�ra savininko"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nerastas"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nepalaikomas tipas"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nepalaikoma schema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nepalaikomas veiksmas"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Vidin� klaida"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Egzistuoja"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Blogas URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "N�ra tokio aplanko %s"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Nebeliko vietos"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Senesnysis savininkas numir�"
 
@@ -26659,6 +26913,26 @@ msgstr "Hostas"
 msgid "The following connections are currently active:"
 msgstr "�emiau nurodytos jungtys �iuo metu yra aktyvios:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalendorius"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Ko_ntaktai:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pa�tas"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "U�duotys"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Aplanko pavadinimas:"
@@ -26671,6 +26945,34 @@ msgstr "Aplanko tipas:"
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplank�:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Sukurti _nauj� aplank�..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Aplanko pavadinimas:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Serverio vardas:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Vartotojo vardas:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26760,15 +27062,15 @@ msgstr "Kit� kart� nebeklausti"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis i� �emiau nurodyt� byl�:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution baigia darb�..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26805,7 +27107,7 @@ msgstr ""
 "Mes tikim�s, kad tau patiks m�s� sunkaus darbo vaisiai, ir\n"
 "laukiame tavo prisid�jimo!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -26813,47 +27115,47 @@ msgstr ""
 "A�i�\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Kit� kart� nebeklausti"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Negal�jau prieiti prie Ximian Evolution apvalkalo."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Negal�jau inicializuoti Ximian Evolution apvalkalo: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 #, fuzzy
 msgid "Disable splash screen"
 msgstr "U�drausti "
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Pradedama importuoti"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Paleid�iami inteligenti�ki importeriai"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Si�sti vis� komponent� derinimo i�vest� � byl�."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Negaliu inicializuoti Bonobo komponent� sistemos."
 
@@ -26893,115 +27195,109 @@ msgstr "Kopijuoti pa�ym�jim�"
 msgid "Copy to Folder..."
 msgstr "Kopijuoti � aplank�..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Sukurti nauj� kontakt�"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Sukurti nauj� kontakt� s�ra��"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "I�kirpti pa�ym�jim�"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "I�trinti pa�ym�tus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Si�sti ko_ntakt� kitam..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Perkelti � aplank�..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "�d�ti i� krep�io"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Per�i�r�ti kontaktus prie� spausdinant"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Spa_udinio per�i�ra"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Spausdinti pa�ym�tus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "I�saugoti pa�ym�tus kontaktus kaip VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Pa�ym�ti visus"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Pa�ym�ti visus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Si�sti lai�k� pa�ym�tiems kontaktams."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Si�sti lai�k� kontaktui"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Si�sti pa�ym�tus kontaktus kitam asmeniui."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Sustabdyti �k�lim�"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "esamas laikas"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Kontakt� _s�ra�as"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Persi�sti kontakt�..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti � aplank�..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "I�_saugoti kaip VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Ie�koti kontakt�"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Pa�ym�ti _visk�"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Si�sti _lai�k� kontaktui..."
@@ -27046,11 +27342,6 @@ msgstr "M�nesis"
 msgid "Previews the calendar to be printed"
 msgstr "Per�i�r�ti kalendori� prie� spausdinant"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Spa_udinio per�i�ra"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Spausdinti �� kalendori�"
@@ -27083,7 +27374,7 @@ msgstr "Savait�"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "U�daryti"
 
@@ -27096,7 +27387,7 @@ msgid "Delete this item"
 msgstr "I�trinti �� element�"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Pagrindin� �rankin�"
 
@@ -27109,8 +27400,8 @@ msgstr "Per�i�r�ti lai�k� prie� spausdinant"
 msgid "Print this item"
 msgstr "Spausdinti �� element�"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "I�saugoti"
 
@@ -27135,9 +27426,9 @@ msgstr "I�saugoti �� element� � disk�"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Byla"
 
@@ -27147,7 +27438,7 @@ msgstr "Spausdinti _vok�..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "I�saugoti _kaip..."
 
@@ -27161,8 +27452,8 @@ msgstr "Si�sti _lai�k� kontaktui..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "I�_saugoti"
 
@@ -27262,26 +27553,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Visam laikui sunaikinti visus i�trintus lai�kus i� vis� aplank�"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Sukurti _nauj� lai�k�"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Kopijuoti lai�k� � nauj� aplank�"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Rodyti lai�ko per�i�ros lang�"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "U�sisakyti ar atsisakyti aplank� nutolusiuose serveriuose"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuali� aplank� taisymas..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtrai..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Per�i�ros sritis"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_U�sisakyti aplankus..."
 
@@ -27378,7 +27679,7 @@ msgstr "Gijomis suskirstytas lai�k� s�ra�as"
 msgid "_Expunge"
 msgstr "I�_valyti"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Aplankas"
 
@@ -27638,181 +27939,196 @@ msgstr "Praeit� neskaityt� lai�k�"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Atsakyti"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Patikrinti, ar yra nauj� lai�k� visuose aplankuose"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Praeit� svarb� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Per�i�r�ti lai�k� prie� spausdinant"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Praeitas"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Spausdinti �� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Persi�sti pasirinkt� lai�k� ka�kam"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Atstatyti teksto original� dyd�"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "I_e�koti lai�ke..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Ma�esnis"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "I�saugoti lai�k� � tekstin� byl�"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Ie�koti eilut�s rodomo lai�ko tekste"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "_Rodyti lai�ko �altin�"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Rodyti pilnas _antra�tes"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Rodyti lai�k� normaliu stiliumi"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Rodyti lai�k� su visomis pa�to antra�t�mis"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Rodyti neapdorot� lai�ko �altin�"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Teksto _dydis"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Sugr��inti pa�ym�tus lai�kus"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "vAplankas pagal _Konferencij�..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "vAplankas pagal Siu_nt�j�..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "vAplankas pagal _Gav�jus..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "vAplankas pagal _Tem�..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Prisegti"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti � aplank�"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtr� i� lai�ko"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "P_ersi�sti lai�k�"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Eiti �"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Viduje"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Didesnis"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Lai�ko rodymas"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Perkelti � aplank�"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Kit� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normalus rodymas"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Atidaryti lai�k�"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Praeit� lai�k�"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cituojant"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Pe_rvadinti..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "�ran_kiai"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "S_ugr��inti"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "U�daryti �� lang�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_U�daryti"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Rodyti"
 
@@ -27842,169 +28158,161 @@ msgstr "U��ifruoti �� lai�k� tavo S/MIME �ifravimo sertifikatu"
 msgid "For_mat"
 msgstr "Formatas"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "_Tekstin� byl�..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "�terpti byl� � lai�k� kaip tekst�"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "�terpti tekstin� byl�..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Atidaryti"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Atidaryti byl�"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP u��ifruoti"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP pasira�yti"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME u��ifruoti"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME pasira�yti"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "I�saugoti kaip"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "I�saugoti juo_dra�t�"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "I�saugoti � aplank�..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "I�saugoti esam� byl�"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "I�saugoti esam� byl� kitokiu vardu"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "I�saugoti lai�k� � nurodyt� aplank�"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Si�sti"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Si�sti v�_liau"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Si�sti v�_liau"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Si�sti lai�k� HTML formatu"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Si�sti lai�k� v�liau"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Si�sti �� lai�k� dabar"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Rodyti/sl�pti priedus"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Rodyti _priedus"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Rodyti priedus"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Pasira�yti �� lai�k� tavo PGP raktu"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Pasira�yti �� lai�k� tavo S/MIME Para�o sertifikatu"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Perjungia, ar BCC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Perjungia, ar CC laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Perjungia, ar Nuo pasirinkimas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Perjungia, ar Atsakyti kam laukas yra rodomas"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "P_ried�..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc laukas"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc laukas"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_I�trinti visk�"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Nuo laukas"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "�terpt_i"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Atsakyti-kam laukas"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "I�saugoti element� ir u�daryti dialogo lang�"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Pagalba"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "I�saugoti para��"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Prid�ti aplank� � u�sakyt� aplank� s�ra��"
@@ -28102,171 +28410,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Prid�ti � _trumpi� juosta"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Keisti �io aplanko pavadinim�"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopijuoti �� aplank�"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Sukurti _nauj� aplank�..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Sukurti nuorod� � �� aplank� trumpi� juostoje"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Sukurti nauj� aplank�"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Sukurti nauj� trump�"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Sukurti nauj� aplank�"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "I�trinti �� aplank�"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Parodyti kit� aplank�"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "I_�eiti"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _Langas"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "I�eiti i� programos"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importuoti duomenis i� kit� program�"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Perkelti �� aplank� � kit� viet�"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Sukurti _nauj� aplank�..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Atidaryti naujame lange"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Atidaryti �� aplank� naujame lange"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot nuostatos..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Si�sti / Gauti"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "I�si�sti laukiant� pa�t� ir parsi�sti nauj� pa�t�"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Pa�to nustatymas"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Rodyti informacij� apie Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "I�si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "I�_si�sti klaidos prane�im�"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Prane�ti apie klaid�, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Perjungti"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplank� juost�"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpi� juost�"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Rodyti parinkt� aplank�"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Apie Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Aplank� juosta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Aplankas"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Eiti � aplank�..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Perkelti..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Naujas aplankas"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot nuostatos..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Kalendoriaus nuostatos..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Si�sti / Gauti"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Trump�"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Trumpi� juosta"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Trump�"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Spausdinti ap�valg�"
@@ -28280,17 +28619,40 @@ msgid "Reload the view"
 msgstr "I� naujo �kelti rodin�"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adres� kortel�s"
+#, fuzzy
+msgid "By _Company"
+msgstr "Pagal kompanij�"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Pagal kompanij�"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adres� kortel�s"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefon� s�ra�as"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Savait�s rodinys"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dien� rodinys"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "M�nesio rodinys"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Darbo savait�s rodinys"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28316,13 +28678,19 @@ msgstr "Pagal tem�"
 msgid "Messages"
 msgstr "Lai�kai"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Su kategorija"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_U�duotis"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28474,11 +28842,11 @@ msgstr "Koduot�"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Paie�kos redaktorius"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "I�saugoti paie�k�"
 
@@ -28518,21 +28886,21 @@ msgstr "�inut�"
 msgid "Don't show this message again."
 msgstr "Kit� kart� neberodyti �ios �inut�s."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Ie�koti"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "I�valyti"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Ie�koti"
 
@@ -28546,19 +28914,128 @@ msgstr "Asmeninis Adres� knygel�s serveris"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): negal�jau inicializuoti GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): negal�jau inicializuoti GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Perkelti..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Susitikimo b�sena pasikeit�. Ar si�sti atnaujint� versij�?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_I�trinti �� �vyk�"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O klaida"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Atsakymo � pasisveikinim� klaida: %s: galb�t nelemtinga"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Baig�si HELO u�klausos laiko riba: %s: nelemtinga"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO atsakymo klaida: %s: nelemtinga"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Baig�si QUIT u�klausos laiko riba: %s: nelemtinga"
+
+#~ msgid "Insert File"
+#~ msgstr "�terpti byl�"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Tu pasirinkai blog� dat�."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Lai�ko data bus palyginta su esamu laiku, kai\n"
+#~ "paleid�iamas filtras ar atidaromas vAplankas."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution naujien� tvarkykl�"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Ar tu tikrai nori i�trinti �i� naujien� s�skait�?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Tu turi susitvarkyti s�skait�, tik tada gal�si i�si�sti �� lai�k�."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP serveris:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Serveriai"
+
+#~ msgid "Source"
+#~ msgstr "�altinis"
+
+#~ msgid "Source Information"
+#~ msgstr "�altinio informacija"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "I�saugoti � disk�..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "I�saugoti lai�k� kaip..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution -- Sukurti nauj� aplank�"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Pasirinkto aplanko tipas yra netinkamas\n"
+#~ "pra�yt�jam veiksmui."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Tu gali importuoti tiktai � lokalius aplankus"
+
+#~ msgid "_Contact List"
+#~ msgstr "Kontakt� _s�ra�as"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "_Tekstin� byl�..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "�terpti byl� � lai�k� kaip tekst�"
+
+#~ msgid "Insert text file..."
+#~ msgstr "�terpti tekstin� byl�..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Si�sti v�_liau"
+
+#~ msgid "Send _later"
+#~ msgstr "Si�sti v�_liau"
+
+#~ msgid "Send the message later"
+#~ msgstr "Si�sti lai�k� v�liau"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot nuostatos..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adres� knygel�s �altinis"
 
@@ -28665,10 +29142,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgstr "Nutraukti veiksm�"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Para�o byla:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "I�trinti visk�, i�skyrus para��"
 
@@ -28999,12 +29472,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovos respublika"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Sukurti nauj� �vyk�"
-
-#~ msgid "Create a new task"
-#~ msgstr "Sukurti nauj� u�duot�"
-
 #~ msgid "New _Task"
 #~ msgstr "Nauja _u�duotis"
 
@@ -29092,9 +29559,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ "Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuot�si "
 #~ "� j�."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Negal�jau autentikuotis � KPOP server�: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Negal�jau prisijungti prie serverio: %s"
 
@@ -29131,10 +29595,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "on or before"
 #~ msgstr "tuo metu ar prie�"
 
-#, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Negal�jau prisijungti prie serverio: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Naujas _pa�to lai�kas"
 
@@ -29178,9 +29638,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizacija:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Prisiminti �� slapta�od�"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�prastai si�sti lai�kus _HTML formatu."
 
@@ -29691,9 +30148,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Pritaikyti visus naujus filtrus lai�kams �ioje d��ut�je"
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Kopijuoti lai�k� � nauj� aplank�"
-
 #~ msgid "Edit the current message"
 #~ msgstr "Taisyti esam� lai�k�"
 
@@ -29854,9 +30308,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "Ca_lendar"
 #~ msgstr "Ka_lendorius"
 
-#~ msgid "Calendar Preferences..."
-#~ msgstr "Kalendoriaus nuostatos..."
-
 #~ msgid "Create Rule"
 #~ msgstr "Sukurti taisykl�"
 
@@ -29872,9 +30323,6 @@ msgstr "init_bonobo(): negal�jau inicializuoti Bonobo"
 #~ msgid "_Mail Configuration..."
 #~ msgstr "_Pa�to nustatymas...."
 
-#~ msgid "_Print Message"
-#~ msgstr "S_pausdinti lai�k�"
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_vAplankas pagal Tem�"
 
diff --git a/po/lv.po b/po/lv.po
index f361b83c49..53603938b7 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: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-01-22 00:27+0200\n"
 "Last-Translator: Peteris Krisjanis <peteris.krisjanis@ttc.lv>\n"
 "Language-Team: Latvian <ll10nt@ttc.lv>\n"
@@ -35,7 +35,7 @@ msgstr "Importē VKartes failus Evolution."
 msgid "File As"
 msgstr "Glabāt Kā"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nosaukums"
@@ -343,46 +343,46 @@ msgstr "%s VKarte"
 msgid "Could not initialize Bonobo"
 msgstr "Nevar inizializēt Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Meklējam..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Ielādējam..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Kļūda meklēšanas izteiksmē."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Pievienojam karti LDAP serverim..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Izņemam karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Mainām karti no LDAP servera..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Parstartējam meklēšanu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Saņemam LDAP meklēšanas rezultātus..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kļūda izņemot vizītkarti"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nevarēja noparsēt URL `%s'"
@@ -474,11 +474,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -494,23 +494,32 @@ msgstr "LDAP Serveris"
 msgid "LDAP server containing contact information"
 msgstr "LDAP serveris, kas satur informāciju par kontaktiem"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Jauns Kontakts"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontaktēties"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Izveidot jaunu kontaktu"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Jauns Kontaktu Saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Kontaktu Saraksts"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Jauns Kontakts"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontaktēties"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Izveidot jaunu kontaktu sarakstu"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -533,30 +542,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL nav vēl atbalstīts šajā evolution kompilējumā)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Nevar initicializēt gnome-vfs"
 
@@ -564,11 +573,11 @@ msgstr "Nevar initicializēt gnome-vfs"
 msgid "Other Contacts"
 msgstr "Citi Kontakti"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nevar atvērt adrešu gramatu"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -578,7 +587,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir izslēgts"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -590,7 +599,7 @@ msgstr ""
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "dabūšanas no saites lejup.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -598,44 +607,44 @@ 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 atļauja atvērt to."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ievadiet %s paroli (lietotājs %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "beidzas ar"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Epasts 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Paplašināts..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Jebkura Kategorija"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ko Mapju Aplūks attēlos"
 
@@ -757,7 +766,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adrešu Grāmatas Resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -851,8 +860,8 @@ msgstr "Konfigurācija"
 msgid "Mappings"
 msgstr "Robežas"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_katru"
@@ -904,8 +913,8 @@ msgstr "Meklēšanas apmēri: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Meklēšana"
 
@@ -1096,15 +1105,15 @@ msgid "Using email address"
 msgstr "Šī ir pas_ta adrese"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Pievienot"
 
@@ -1150,12 +1159,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_ediģēt"
@@ -1270,10 +1279,10 @@ msgstr "Ražotne Adrešu grāmatas vārda izvēles interfeisam"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Izņemt"
 
@@ -1302,43 +1311,15 @@ msgstr "(%d nav parādīts)"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts Kontakts"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Izvēlieties Kontaktus no Adrešu Grāmatas"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Sūtītājs satur"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution nevar dabūt adrešu grāmatas lokālo glabatuvi.\n"
-"Tas varētu būt tādēļ, ka evolution-adressbook komponents nokārās.\n"
-"Lai palīdzētu mums labāk izprast un ātri atrisināt šo problēmu,\n"
-"lūdzu sūtiet epastu Jon Trowbridge <trow@ximian.com> ar\n"
-"detalizētu apstākļu aprakstu, pie kuriem kļūda\n"
-"parādijās. Paldies."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution nevar dabūt adrešu grāmatas vietējo glabātuvi.\n"
-"Normālos apstākļos tam nekad nevajadzētu notikt.\n"
-"Jums vajag iziet un pārstartēt Evolution lai atrisinātu\n"
-"šo problēmu."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Izvēlieties Kontaktus no Adrešu Grāmatas"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Izvēleties Vārdu"
@@ -1360,15 +1341,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Pārvietot..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "M_ape:"
 
@@ -1474,11 +1450,12 @@ msgstr "Grib saņemt _HTML pastu"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Dzēst"
 
@@ -2717,7 +2694,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Slēpt adreses kad sūtam šo uz sarakstu"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Izņemt"
 
@@ -2780,7 +2757,7 @@ msgstr ""
 "eksistē šajā mapē. Vai jūs to vēlaties pievienot jebkurā gadījumā?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Paplašinātā Meklēšana"
 
@@ -2808,21 +2785,21 @@ msgid "Error getting book view"
 msgstr "Kļūda sāknējot %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kļūda mainot vizītkarti"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Veiksmīgi"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
@@ -2830,8 +2807,8 @@ msgstr "Nezināma kļūda"
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
@@ -2848,7 +2825,7 @@ msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2871,48 +2848,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Fails %s neeksistē"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Kļūda pievienojot vizītkarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kļūda izņemot vizītkarti"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Attēlot"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Attēlot"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2920,22 +2902,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nav vizītkaršu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nav vizītkaršu"
@@ -3008,7 +2990,7 @@ msgstr "Adrešu grāmata"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Saglabāt kā VKarti"
 
@@ -3048,7 +3030,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot Uzstādījumi..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Pārsūtīt Kontaktu"
 
@@ -3057,8 +3039,8 @@ msgid "Send Message to Contact"
 msgstr "Sūtīt Vēstuli Kontaktam"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Drukāt"
@@ -3078,7 +3060,7 @@ msgid "Move to folder..."
 msgstr "Pārvietot uz _Mapi..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
@@ -3089,20 +3071,20 @@ msgid "Copy"
 msgstr "Kopēt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Dzēst"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Pašreizējais Skats"
@@ -3271,7 +3253,7 @@ msgstr "Robežas"
 msgid "Number of columns:"
 msgstr "Kolonu skaits:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opcijas"
 
@@ -3361,26 +3343,26 @@ msgstr "Nenosaukta tikšanās"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Augsts"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normāls"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Zems"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinēts"
@@ -3503,11 +3485,11 @@ msgstr "Snaust kādu laiku (minūtes)"
 msgid "_Edit appointment"
 msgstr "R_ediģēt satikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 #, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
@@ -3520,13 +3502,13 @@ msgstr ""
 "\n"
 " normāls kaste."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3543,7 +3525,7 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Neprasiet man vēlreiz."
@@ -3572,7 +3554,7 @@ msgstr "Apraksts satur"
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Nesakrītoši"
 
@@ -3583,7 +3565,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3605,17 +3587,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privāts"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidenciāls"
@@ -3640,37 +3622,37 @@ msgstr "A"
 msgid "W"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Brīvs"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nav iesākts"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Progresā"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Pabeigts"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3681,56 +3663,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Nekas"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Periodisks"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Asignēts"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Jā"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nē"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dienas Skats"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Darba Nedēļas Skats"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Nedēļas Skats"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Mēneša Skats"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalendārs"
 
@@ -3738,12 +3719,12 @@ msgstr "Kalendārs"
 msgid "Folder containing appointments and events"
 msgstr "Mape, kur atrodas informācija par satikšanām un notikumiem"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Uzdevumi"
 
@@ -3751,44 +3732,62 @@ msgstr "Uzdevumi"
 msgid "Folder containing to-do items"
 msgstr "Uzdevumu mape"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Jauna Tikšanās"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Satikšanās"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Ievietot jaunu ierakstu par satikšanos"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Ziņas"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Ievietot jaunu uzdevumu"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Ievietot jaunu uzdevumu"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Jauna Tikšanās"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Jauna Tikšanās"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Satikšanās"
+msgid "Create a new all-day appointment"
+msgstr "Ievietot jaunu ierakstu par satikšanos"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3855,7 +3854,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dienas"
 
@@ -3863,11 +3863,13 @@ msgstr "dienas"
 msgid "extra times every"
 msgstr "papildus laiks katras"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "stundas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minūtes"
 
@@ -3995,7 +3997,7 @@ msgstr "Atgādinājumi"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -4024,7 +4026,7 @@ msgstr "satikšanās beigas"
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -4202,7 +4204,7 @@ msgid "_Fri"
 msgstr "_Piek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Galvenais"
 
@@ -4247,20 +4249,34 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "pirms tikšanās sākuma"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Satikšanās statuss ir izmainīts. Nosūtīt atjaunināto versiju?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo satikšanos?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
@@ -4332,61 +4348,61 @@ msgstr " (Līdz "
 msgid "Due "
 msgstr "Līdz"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nevar atjaunināt objektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Rediģēt Satikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "satikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
@@ -4586,7 +4602,7 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4598,7 +4614,7 @@ msgstr "Loma"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4683,7 +4699,7 @@ msgstr "uz"
 msgid "first"
 msgstr "saraksts"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunde"
 
@@ -4707,7 +4723,7 @@ msgstr "saraksts"
 msgid "Other Date"
 msgstr "Cits Fakss"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dienā"
 
@@ -4807,20 +4823,26 @@ msgstr "% Izpildīts"
 msgid "Date Completed:"
 msgstr "Izpildes Datums:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Pieprasa Darbību"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Progress"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritāte:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Statuss:"
 
@@ -4834,7 +4856,7 @@ msgstr "Pamata"
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4903,80 +4925,80 @@ msgstr "80%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Dzēšam "
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izgriezt"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Nozīmēt Uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt Uzdevumus kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst Izvēlētos Uzdevumus"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikšķināt lai pievienotu uzdevumu"
@@ -4985,8 +5007,8 @@ msgstr "Klikšķināt lai pievienotu uzdevumu"
 msgid "Alarms"
 msgstr "Brīdinājumi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Izpildīts"
 
@@ -5014,11 +5036,9 @@ msgstr "Prioritāte"
 msgid "Start Date"
 msgstr "Sākuma Datums"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Kopsavilkums"
 
@@ -5060,110 +5080,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Jauna _Satikšanās"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Jauns Visas Di_enas Notikums"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Satikšanās"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Jauns Uzdevums"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Drukāt..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ej Uz _Dienu"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ej uz Datumu..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfigurācija"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfigurācija"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Saglabāt Kā..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Plānot _Tikšanos"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Dzēst šo _Gadījumu"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Dzēst Visus G_adījumus"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot rīki nav uzstādīti šajā sistēmā."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Kļūda sāknējot %s."
@@ -5204,7 +5223,7 @@ msgstr "Uzdevums Pabeigts: <b>"
 msgid "Task Due: <b>"
 msgstr "Uzdevums Līdz: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar informācija"
 
@@ -5213,12 +5232,12 @@ msgstr "iCalendar informācija"
 msgid "iCalendar Error"
 msgstr "iCalendar Kļūda"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5226,325 +5245,330 @@ msgstr ""
 "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
 "izvēlnes zemāk."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "L_okācija: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Statuss:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Paigaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Noliegts"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Atjaunot"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Paigaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Sūtīt Pēdīgo Informāciju"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ir publicējis informāciju par tikšanos."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informācija par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pieprasa tavu klātbūtni tikšanās."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Satikšanās Iemesls"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošai tikšanās."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Atjaunināta Informācija Par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par tikšanos."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Informācijas Par Satikšanos Atjaunināšanas Pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ir atbildējis uz tikšanās pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Atbilde Par Satikšanos"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis tikšanos."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Satikšanās Atcelšana"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ir atsaucis tikšanos."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Slikta Satikšanās Ziņa"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ir publicējis informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Uzdevuma Priešlikums"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Uzdevuma Atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Uzdevuma Atjaunināšanas Pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ir atbildējis uz uzdevuma nozīmēšanu."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Uzdevuma Atbilde"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Uzdevuma Atsaukums"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Slikts Uzdevuma Ziņojums"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ir publicējis brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Brīvs/Aizņemts Informācija"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Brīvs/Aizņemts Pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Brīvs/Aizņemts Atbilde"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/Aizņemts Ziņa"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Šī mape izskatās ir neatgriezeniski sabojāta."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Pievienojums nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Pievienojumam nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalendāra fails nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Apmeklētāja status nevar tikt atjaunināts tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Izņemšana Pabeigta"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izvēlēties Mapi"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izvēlēties Mapi"
@@ -5590,7 +5614,7 @@ msgstr "datums-beigas"
 msgid "Chair Persons"
 msgstr "Vadošās Personas"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Pieprasītie Dalībnieki"
 
@@ -5603,57 +5627,52 @@ msgid "Non-Participants"
 msgstr "Nepiedalās"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuāli"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupa"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Resurss"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Istaba"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Krēsls"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Pieprasītais Dalībnieks"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Iespējamais Dalībnieks"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Nepiedalās"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Pieprasa Darbību"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Pagaidu"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Deleģēts"
 
@@ -5743,49 +5762,46 @@ msgstr "Satikšanās _sākuma laiks:"
 msgid "Meeting _end time:"
 msgstr "Satikšanās _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nevar ielādēt uzdevumus uz `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nevar atvērt mapi uz `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Izpildes Datums"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Dzēšam "
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Dzēšam mapi"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Jauna _Tikšanās...."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Dzēst šo Tikšanos"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5796,11 +5812,16 @@ msgstr "Nevar atvērt mapi uz `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Pieprasītā metode, lai atvērtu `%s' nav atbalstīta"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Atvērt kalendāru uz %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Atveram mapi %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprīlis"
@@ -5857,53 +5878,58 @@ msgstr "Oktobris"
 msgid "September"
 msgstr "Septembris"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Vismaz viens apmeklētajs ir vajadzīgs"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Jābūt norādītam organizētājam."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Notikuma informācija"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Uzdevuma Informācija"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Žurnāla informācija"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Brīvs/Aizņemts informācija"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalendāra informācija"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Atjaunot"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Atsvaidzināt Sarakstu"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Jums jābūt notikuma apmeklētājam."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Nevar inizializēt Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "komponents"
@@ -6131,9 +6157,8 @@ msgid "Print Calendar"
 msgstr "Drukāt Kalendāru"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
@@ -6168,8 +6193,8 @@ msgstr ""
 "\n"
 "?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
@@ -6227,17 +6252,29 @@ msgstr "Importē VKartes failus Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importē VKartes failus Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Nevar savienoties ar glabātuvi: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Atgādinājums"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendāra Ziņojums"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6246,128 +6283,128 @@ msgstr ""
 "Evolution ir atradis Pine pasta failus.\n"
 "Vai jūs vēlaties, lai tie tiktu importēti Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalendārs"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now pieprasa 0 argumentus"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time pieprasa 1 argumentu"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pieprasa argumentu nr.1 kā virkni"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time argumentam nr. 1 jābūt ISO 8601 datuma/laika virknei"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 #, fuzzy
 msgid "time-add-day expects 2 arguments"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 #, fuzzy
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 #, fuzzy
 msgid "time-day-begin expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 #, fuzzy
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 #, fuzzy
 msgid "time-day-end expects 1 argument"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 #, fuzzy
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "dienā"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 #, fuzzy
 msgid "get-vtype expects 0 arguments"
 msgstr "dabūt"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "satur"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 #, fuzzy
 msgid "contains? expects argument 1 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 #, fuzzy
 msgid "contains? expects argument 2 to be a string"
 msgstr "satur"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 #, fuzzy
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "satur apraksts"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 #, fuzzy
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr "visi"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "ir"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "pirms"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "pirms"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7994,72 +8031,82 @@ msgstr "Glabājam mapi '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Jums ir jāstrādā tiešsaistē lai izpildītu šo operāciju"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Kļūda parsējot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Nespēj atvērt spool mapi"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spool mapi"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Nepareizi argrumenti"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Nepareizi argrumenti"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
@@ -8114,7 +8161,7 @@ msgstr "Pārvietojam vēstules"
 msgid "Copying messages"
 msgstr "Kopējam vēstules uz %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8122,47 +8169,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no POP servera: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Nav dots faila nosaukums."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nevar kodēt šo vēstuli: nav norādīti saņēmēji"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8170,18 +8217,18 @@ msgid ""
 "%.*s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Neizdevās keišot vēstuli %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Neizdevās atkodēt vēstuli"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nevar pārbaudīt šo vēstuli: nevarēja izveidot pagaidu failu: %s"
@@ -8207,22 +8254,22 @@ msgid "Could not lock '%s'"
 msgstr "Nevarēja noslēgt '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot fctl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot flock(2): %s"
@@ -8281,11 +8328,15 @@ msgstr "Kļūda rakstot pasta pagaidu failu: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Kļūda kopējot pasta pagaidu failu: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8421,7 +8472,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -8595,26 +8646,134 @@ msgstr "Nevar dabūt mapi: Nepareiza operācija šajā glabātuvē"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevar izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Neizdevās pārbaudīt sertifikātu"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Neizdevās pārbaudīt sertifikātu"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Paraksta fails:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifikāta ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Kļūda ielādējot %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Neatrodas Birojā"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Neizdevās pārbaudīt sertifikātu"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifikāta ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Nepareizs arguments"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifikāta ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifikāta ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8623,16 +8782,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8647,32 +8818,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nevarēja noparsēt URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Kļūda sāknējot %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nav tādas vēstules %s iekš %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -8680,12 +8856,12 @@ msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
@@ -8714,40 +8890,40 @@ msgstr "IMAP servera atbilde nesaturēja %s informāciju"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Negaidīta OK atbilde no IMAP servera: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nevar ielādēt %s kopsavilkumu"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Meklējam jaunās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8756,10 +8932,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "Nevarēja atvērt keišdirektoriju: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Neizdevās keišot vēstuli %s: %s"
@@ -8772,7 +8948,7 @@ msgstr "Pārbaudam jauno pastu"
 msgid "Check for new messages in all folders"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mapes"
 
@@ -8802,7 +8978,7 @@ msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Parole"
 
@@ -8810,73 +8986,77 @@ msgstr "Parole"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parastu teksta paroli."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s serviss priekš %s uz %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Konekcija pārtraukta"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nevarēja savienoties ar %s (ports %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operācija nav atbalstīta"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikācija izjukusi."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mape nav tukša"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8887,31 +9067,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mapes nosaukums nedrīkst saturēt Return simbolu."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8934,7 +9120,9 @@ msgid "Local delivery"
 msgstr "Lokāla piegāde"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8964,12 +9152,12 @@ msgstr "Standarts"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "failus."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8980,38 +9168,38 @@ msgstr "Glabātuves sakne %s nav absolūtais ceļš"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nevar dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nevar ielādēt %s: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Nevarēja izdzēst mapes kopsavilkuma failu `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nevarēja izdzēst mapes indeksa failu `%s': %s"
@@ -9072,7 +9260,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9110,26 +9298,26 @@ msgstr "nav maildir direktorija"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nevarēja skanēt mapi `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nevar atvērt maildir direktorijas ceļu: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Pārbaudam jauno pastu"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Meklējam jaunās vēstules"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Glabājam mapi"
@@ -9174,7 +9362,7 @@ msgstr "Šī mape izskatās 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9183,7 +9371,7 @@ msgstr ""
 "Nevar atvērt failu '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9192,14 +9380,14 @@ msgstr ""
 "Nevar izveidot failu '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nav pareizs fails."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9208,7 +9396,7 @@ msgstr ""
 "Nevarēja izdzēst mapi `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
@@ -9223,64 +9411,64 @@ msgstr "Nevarēja atvērt mapi: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nevarēja pārbaudīt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nevar atvērt failu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Kopsavilkuma un mapes nesakrišana, pat pēc sinhronizācijas"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nezināma kļūda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nevarēja atvērt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Kļūda rakstot pagaidu pastkastē: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9429,50 +9617,50 @@ msgstr "Atsaukt"
 msgid "Operation failed: %s"
 msgstr "Operācija atsaukta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Saņemam POP kopsavilkumu"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operācija atsaukta"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nevar dabūt mapi: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Iznīcināt dzēstās vēstules"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nav vēstules ar uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Saņemam POP vēstuli %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Nezināmi nokrišņi"
@@ -9490,7 +9678,7 @@ msgstr "Atstāt vēstules uz servera"
 msgid "Delete after %s day(s)"
 msgstr "Dzēst pēc %s dienas (ām)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9513,6 +9701,11 @@ msgid ""
 "claim to support it."
 msgstr "visi."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nevarēja savienoties ar %s (ports %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9524,55 +9717,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Nevarēja savienoties ar POP serveri uz %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
-#, fuzzy
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "\n"
 " Nē."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/O kļūda"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"Neiespējami autentificēties ar IMAP serveri.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLūdzu ievadiet %s@%s POP3 paroli"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Kļūda savienojoties ar POP serveri.\n"
 "Kļūda sūtot paroli: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9598,35 +9795,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nevarēja sazarot sendmail: %s: pasts nav nosūtīts"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nevarēja nosūtit vēstuli: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail iziet ar signālu %s: pasts nav nosūtīts."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nevarēja palaist %s: pasts nav nosūtīts."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail izgāja ar statusu %d: pasts nav nosūtīts."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9739,45 +9936,45 @@ msgstr "Pagaidu autentifikācijas problēma"
 msgid "Authentication required"
 msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Apsveikuma atbildes kļūda: %s: iespējami ne fatāla"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nevar savienoties ar POP serveri.\n"
 "Kļūda sūtot lietotajvārdu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ziņa varētu būt pareizi noformēta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLūdzu ievadiet %s@%s SMTP paroli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9788,92 +9985,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pasta nosūtīšana caur  %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 #, fuzzy
 msgid "Cannot send message: no recipients defined."
 msgstr "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "nē."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP Apsveikums"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO pieprasījums iztecējis: %s: ne fatāli"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO atbildes kļūda: %s: ne fatāli"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET atbildes kļūda: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 #, fuzzy
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH neveiksmīgs pieprasījums."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM atbildes kļūda: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
@@ -9881,90 +10078,90 @@ msgstr "DATA pieprasījums iztecējis: %s: pasts nav nosūtīts"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA sūtijums iztecējis: vēstules pārtraukšana: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Slikta autentifikācijas atbilde no servera."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT pieprasījums iztecējis: %s: ne fatāli"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH pieprasījums iztecējis: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "RSET atbildes kļūda: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 baits"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u baiti"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "pievienojums"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Izņemt izvēlētos priekšmetus no pievienojumu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Pievienot pievienojumu..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Pievienot failu vēstulei"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nevar pievienot failu %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nevar pievienot failu %s: neregulārs fails"
@@ -9982,73 +10179,85 @@ msgid "MIME type:"
 msgstr "MIME tips:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku pievienojuma attēlošanu"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Uz adrešu grāmatu"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "No:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Atbildēt Kam:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "No:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Subjekts:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Ievadiet vēstules saņēmējus"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ievadiet adreses kuras saņems vēstules kopiju"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "saraksts."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Pievienot failu"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nevarēja izveidot PGP paraksta kontekstu."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10057,34 +10266,34 @@ msgstr ""
 "Kļūda kāmēr lasot failu %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Brīdinājums!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fails eksistē, pārrakstīt?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Kļūda ielādējot failu: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Kļūda atverot failu: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10093,7 +10302,7 @@ msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10102,7 +10311,7 @@ msgstr ""
 "Nevar samazināt failu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10111,7 +10320,7 @@ msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10119,7 +10328,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10129,49 +10338,45 @@ msgstr ""
 "\n"
 "Vai tu vēlies saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta Vēstule"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Ievietot failu"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Saglabāt parakstu"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "(noklusētais)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Uzrakstīt vēstuli"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10180,9 +10385,9 @@ msgstr ""
 "\n"
 " HTML komponents."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10247,8 +10452,8 @@ msgstr "Subjekts satur"
 msgid "Subject does not contain"
 msgstr "Subjekts nesatur"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10256,12 +10461,11 @@ msgstr ""
 "Fails ar šadu nosaukumu jau eksistē.\n"
 "Pārrakstīt to?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Atceries šo paroli"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Atceries šo paroli uz atlikušo sesiju"
 
@@ -10360,150 +10564,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "gads"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "gadi"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekundes"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mēnesis"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "stundas"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mēneši"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "stunda"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "nedēļa"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "nedēļas"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "stunda"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mēnesis"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "stundas"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mēneši"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekundes"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "gads"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "gadi"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Jūs esat aizmirsis izvēlēties datumu."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Jūs esat izvēlējies nepareizu datumu."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"laiku, ka tiks palaists filtrs vai\n"
-"vmape atvērta."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"laiku ko jūs norādīsiet šeit."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"relatīvo laiku, kad filtrs palaists.\n"
-" \"nedēļa atpakaļ\", piemēram."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "pašreizējais laiks"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "laiks, kuru jūs norādāt"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Izvēlieties laiku ar ko salīdzināt"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Salīdzināt ar"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klikšķini šeit lai izvēlētos datumu>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "tagad"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " atpakaļ"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "atpakaļ"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " atpakaļ"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<klikšķini šeit lai izvēlētos datumu>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Izvēlieties laiku ar ko salīdzināt"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtra Noteikumi"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stila nosaukums:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Glabātuves sakne %s nav regulāra direktorija"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Izvēlieties darbību:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Tad"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Pievienot darbību"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10511,12 +10665,12 @@ msgstr ""
 "Jūs aizmirsāt izvēlēties mapi.\n"
 "Dodaties atpakaļ un izvēlieties pareizu mapi uz kurieni nosūtīt pastu."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Izvēlēties Mapi"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10525,92 +10679,168 @@ msgstr ""
 "Kļūda neregulārajā izteiksmē '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Svarīgs"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Korka"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Galvenais"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "pēc"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Tests"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Noteikuma nosaukums:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Nenosaukts"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Ja"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Aktivizēt darbības"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "ja visi kritēriji sakrīt"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "ja jebkuršs kritērijs sakrīt"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Pievienot kritēriju"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "ienākošais"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "izejošais"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Salīdzināt ar"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Rediģēt Filtrus"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Rediģēt VMapes"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Ienākošais"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Izejošais"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"laiku ko jūs norādīsiet šeit."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"relatīvo laiku, kad filtrs palaists.\n"
+" \"nedēļa atpakaļ\", piemēram."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"laiku ko jūs norādīsiet šeit."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuālās Mapes"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "atpakaļ"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tikai specifiskas mapes"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "pašreizējais laiks"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "laiks, kuru jūs norādāt"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vMapes Avoti"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "ar visām akīvajām attālinātajām mapēm"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "ar visām lokālām mapēm"
 
@@ -10638,42 +10868,42 @@ msgid "Beep"
 msgstr "Belema"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Kompānija"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "satur"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopēt uz Mapi"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Saņemšanas datums"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Nosūtīšanas Datums"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nesatur"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nebeidzas ar"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "neeksistē"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neeksistē"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "neskan kā"
@@ -10695,93 +10925,89 @@ msgid "ends with"
 msgstr "beidzas ar"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksistē"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksistē"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izteiksme"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Svarīgs"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "ir"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "bija pēc"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "bija pirms"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Karogots"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "ir lielāks par"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "ir mazāks par"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nav"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Karogots"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "_Lielāks"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Adresātu saraksts"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Ziņojuma Rumpis"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Ziņojuma Iesākums"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Pārvietot uz Mapi"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Sūtīt Vēstuli Kontaktam"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spēlēt Skaņu:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lasīt"
 
@@ -10797,57 +11023,87 @@ msgstr ""
 msgid "Replied to"
 msgstr "Atbildēts uz"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Kopne"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "ir lielāks par"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "ir mazāks par"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Rezultāts"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Sūtītajs"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Uzstādīt Statusu"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Kompānija"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Izmērs (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "skan kā"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Avota Konts"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifisks iesākums"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "sākas ar"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Apturēt Procesēšanu"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Subjekts"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Uzstādīt Statusu"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Noteikumi"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Pievienot Noteikumu"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Rediģēt Noteikumu"
 
@@ -10855,11 +11111,11 @@ msgstr "Rediģēt Noteikumu"
 msgid "Score Rules"
 msgstr "Rezultāta Noteikumi"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Jums jānorāda vismaz viena mape kā avots."
 
@@ -10867,31 +11123,31 @@ msgstr "Jums jānorāda vismaz viena mape kā avots."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importējam..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importējam %s kā %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Skanējam %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Pasts"
 
@@ -10952,39 +11208,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Atkritumkaste"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokālā pasta fails %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Skanējam direktoriju"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Sākam importu"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediģēt Filtrus"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11066,12 +11322,12 @@ msgstr "Pasta Kopsavilkuma komponentes ražotne."
 msgid "Font Preferences"
 msgstr "Bez A_tkārtošanās"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11119,7 +11375,7 @@ msgstr "Rekvizīti..."
 msgid "Change this folder's properties"
 msgstr "Izmainīt šīs mapes rekvizītus"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11127,59 +11383,79 @@ msgstr ""
 "Kādi no pasta uzstādījumiem ir nepareizi, lūdzu pārbaudiet vai viss ir "
 "kārtībā."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 #, fuzzy
 msgid "You have not set a mail transport method"
 msgstr "uzstādīt"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Brīdinājums: Mainīta Vēstule"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Jauna Pasta Ziņojums"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Pasta Vēstule"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Uzrakstīt vēstuli"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Jauna Vēstule"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Iepriekšējā Vēstule"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Jauna Pasta Ziņojums"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nevar initializēt Evolution pasta komponenti."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nevar initializēt Evolution pasta konfigurācijas komponentu."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nevar initializēt Evolution mapes informatīvo komponentu."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Nevar reģistrēt glabātuvi ar čaulu"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr " \"%s\" Rekvizīti"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Rekvizīti"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
@@ -11229,135 +11505,135 @@ msgstr "%d kopā"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _Virtuālu Mapi No Vēstules"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VMape ar Subjektu"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VMape ar Sūtītāju"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r Saņēmējiem"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar Adresātu sarakstu"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz Subjektu"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz Sūtītāju"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz Saņēmējiem"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz Adresātu Sarakstu"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā Jaunu Ziņojumu..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Atbildēt Sūtītājam"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Atbildēt uz _Sarakstu"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Atbildēt _Visiem"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Pabeigts"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Tīrs"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā Lasītu"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _Neizlasītu"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _Svarīgu"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt _kā Nesvarīgu"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pievienot Sūtītāju Adrešu Grāmatai"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Attiecināt Filtrus"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Izveidot Noteikumu No Vēstules"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMape Pasta Sarakstei"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrs Pasta Sarakstei (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMape Pasta Sarakstam (%s)"
@@ -11423,78 +11699,69 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 #, fuzzy
 msgid "You have not filled in all of the required information."
 msgstr "visi."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution Ziņu Redaktors"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Kontu Redaktors"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Resursdators:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 #, fuzzy
 msgid "You may not create two accounts with the same name."
 msgstr "ar."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nedzēst"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Tiešām dzēst kontu?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Izslēgt"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aktivizēt"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst ziņu kontu?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktivizēts"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Kont_a vārds:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Riko"
@@ -11504,30 +11771,30 @@ msgstr "Puerto Riko"
 msgid "Mail to %s"
 msgstr "Pasts uz %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekts ir %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Pasts no %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s epasta sarakste"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Pievienot Filtra Noteikumus"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11535,7 +11802,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 #, fuzzy
 msgid ""
 "You have not configured the mail client.\n"
@@ -11548,7 +11815,7 @@ msgstr ""
 "\n"
 " tagad?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 #, fuzzy
 msgid ""
 "You need to configure an identity\n"
@@ -11557,7 +11824,7 @@ msgstr ""
 "\n"
 " pirms."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 #, fuzzy
 msgid ""
 "You need to configure a mail transport\n"
@@ -11567,18 +11834,18 @@ msgstr ""
 " pirms."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 #, fuzzy
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr "HTML HTML"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Sūtīt jebkurā gadījumā?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11586,18 +11853,18 @@ msgstr ""
 "Šai vēstulei nav virsraksta\n"
 "Patiešām nosūtīt?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 #, fuzzy
 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 "saraksts ir saraksts Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Šī vēstule satur tikai Bcc adresātus."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11607,16 +11874,11 @@ msgstr ""
 "ir Kam\n"
 " Sūtīt?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Jums jānorāda saņēmēji, lai nosūtītu šo vēstuli."
 
-#: mail/mail-callbacks.c:499
-#, fuzzy
-msgid "You must configure an account before you can send this email."
-msgstr "pirms."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11624,28 +11886,28 @@ msgstr ""
 "Nevar atvērt melnraksta mapi šim kontam.\n"
 "Vai jūs vēlaties lietot noklusēto melnrakstu mapi?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d at %H:%M, %%s rakstīja:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Pārvietot vēstule(s) uz"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopēt vēstule(s) uz"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Vai jūs esat pārliecināts, ka vēlaties rediģēt visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
@@ -11654,7 +11916,7 @@ msgstr ""
 "\n"
 " Melnraksti."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11662,39 +11924,39 @@ msgstr ""
 "Jūs varat pārsūtīt vēlreiz tikai\n"
 "tās vēstules, kas Nosūtīts mapē."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Nav Izvēlēta Vēstule"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Pārrakstīt failu?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Saglabāt Vēstuli Kā..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Saglabāt Vēstules Kā..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Parādīt nākošo neizlasīto vēstuli"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 #, fuzzy
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
@@ -11706,7 +11968,7 @@ msgstr ""
 "\n"
 "?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11715,28 +11977,28 @@ msgstr ""
 "Kļūda ielādējot filtra informāciju:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Drukāt Vēstuli"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Vēstule"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Vēstules drukāšana neizdevās"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11759,7 +12021,7 @@ msgstr "Nav apraksta"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Nenosaukts Kontakts"
@@ -11780,10 +12042,11 @@ msgid "Add Signature"
 msgstr "Saglabāt parakstu"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Lūdzu zemāk ievadiet jūsu vārdu un epasta adresi. \"Optionālie\" lauki var "
 "tikt neaizpildīti,\n"
@@ -11793,8 +12056,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "ienākošais Ja sistēma\n"
 " Internets."
@@ -11807,8 +12069,7 @@ msgstr "Lūdzu izvēlieties starp sekojošām iespējām"
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Ja sistēma\n"
 " Internets."
@@ -11817,12 +12078,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Jūs gandrīz esat pabeiguši epasta konfigurācijas procesu. ar ienākošais\n"
 " izejošais\n"
@@ -11830,44 +12089,20 @@ msgstr ""
 "."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution Kontu Asistents"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Korka"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Galvenais"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "pēc"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konts"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Pārbaudam Servisu"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
@@ -12131,241 +12366,229 @@ msgstr "Saglabāt un Aizvērt"
 msgid "Loading Images"
 msgstr "_Ielādēt Attēlus"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Pasta Konfigurācija"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta:"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Ziņojuma Iesākums"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Vēstules Attēlošana"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronēzija"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Serveris:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Pasta Konfigurācija"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Ziņas"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Optionāla Informācija"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Orani_zācija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt,  kad sūta vēstuleas tikai ar norādītiem _Bcc saņēmējiem"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Drukāt izvēlētos kontaktus"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nevar atvērt vēstuli"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Atc_eries šo paroli"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Atbildēt Kam:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Saņemam Epastu"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Saņemam Opcijas"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Atceries šo paroli"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Pieprasītā Informācija"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Noklusētais"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Drošība"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Drošais MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Izvēlieties PGP bināri"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Sūtam Epastu"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Nosūtītās ziņas un Ziņu Paraugi"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Servera Konfigurācija"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Servera _Tips:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Saīsinājumi"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Saglabāt parakstu"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Avots"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Avota Informācija:"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stila nosaukums:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12375,204 +12598,200 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Austrumu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules lietojot šo kontu"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentifikācijas Tips:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Apstiprināt, kad Izdzēš mapi"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Noklusētais"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktivizēt"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Pārsūtīt Kā"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pilns Vārds:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML pastā"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitāte"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Uzstādīt šo kā manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā Lasītas pēc"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "Vārds:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nekad nelādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP programmas ceļš:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Norādīt, kad sūta vēstules ar tukšu subj_ektu."
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Saņemam Pastu"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Atbildēt Visiem"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sūtam Pastu"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Parādī Laiku Kā"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML Paraksts:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Lietot dr_ošu savienojumu (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Mainīgs"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_katru"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "krāsa"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "zinulogs1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12596,203 +12815,213 @@ msgstr "Nevarēja izveidot S/MIME aploksnes kontekstu."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Saglabāt Pievienojumu"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Saglabāt uz Diska..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Saglabāt Pievienojumu"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Skatīt Iekšēji"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Skatīt Iekšēji (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Slēpt"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Ārējais Skatītājs"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "_Ielādēt Attēlus"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Ielādējam vēstules saturu"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "N_okavētie uzdevumi:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Kopēt Saiti Pārlūkprogrammā"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopēt Saites Lokāciju"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Saglabāt Saiti kā (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Saglabāt attēlu kā..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s pievienojums"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nevar noparsēt MIME vēstuli. Attēlojam kā avotu."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Nepareiza Adrese"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "No"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Atbildēt-Uz"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kam"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Pastnieks: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Saglabāt Vēstuli Kā..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta. Klikšķiniet uz slēdzenes ikonu, lai "
 "uzzinātu vairāk."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nevarēja izveidot PGP pārbaudes kontekstu."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Šī vēstule ir digitāli parakstīta un ir autentiska."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Šī vēstule ir digitāli parakstīta bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Norāde uz FTP saiti (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Norāde uz lokālu failu (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokālās Mapes"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Pārkonfigurēt mapi"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s varētu netikt pārkonfigurēta, jo tā nav vietējā mape"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 #, fuzzy
 msgid ""
 "If you can no longer open this mailbox, then\n"
@@ -12801,16 +13030,16 @@ msgstr ""
 "Ja nē\n"
 "."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Pārkonfigurēt /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12819,7 +13048,7 @@ msgstr ""
 "Kļūda kamēr '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12828,7 +13057,7 @@ msgstr ""
 "Kļūda kamēr izpildot operāciju:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Strādā"
 
@@ -12836,100 +13065,100 @@ msgstr "Strādā"
 msgid "Filtering Folder"
 msgstr "Filtrējam Mapi"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Pasta Ienešana"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Kaut arī, vēstule tika veiksmīgi nosūtīta."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sūtam \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam vēstuli %d no %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Kļūda pie %d vēstules no %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Saglabājam vēstuli mapē"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietojam vēstules uz %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopējam vēstules uz %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanējam mapes \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveram mapi %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveram glabātuvi %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemam mapi %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabājam mapi '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Atjauninām mapi"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Dzēšam mapi"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemam vēstuli %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Saņemam %d vēstule(s)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Saglabājam %d vēstuli(es)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12938,7 +13167,7 @@ msgstr ""
 "Nevar izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12947,11 +13176,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Saglabājam pievienojumu"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12960,27 +13189,22 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēja ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojamies no %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojamies ar %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Meklēt"
 
@@ -13035,32 +13259,41 @@ msgstr "Ceļš: %s, Tips: %s"
 msgid "Type: %s"
 msgstr "Tips: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Sūtīt & Saņemt Pastu"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Atcelt Visu"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Atjauninām..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Gaidām..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Atceries šo paroli"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Atceries šo paroli uz atlikušo sesiju"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s Paroli"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Ievadiet Paroli"
 
@@ -13087,7 +13320,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nosaukums:"
 
@@ -13117,7 +13350,7 @@ msgstr "Pārsūtītā vēstule - %s"
 msgid "Forwarded message"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Pārsūtīta Vēstule"
 
@@ -13131,7 +13364,7 @@ msgstr "Uzstādām vmapi: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13140,94 +13373,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VMapes"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Rediģēt VMapi"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Jauna VMape"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Nav subjekta)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Vēstule"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas Neredzētas Ziņas"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Vairākas Ziņas"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardiena %I:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Izveidojam vēstuļu sarakstu"
 
@@ -13262,47 +13498,47 @@ msgstr "Saņemts"
 msgid "Size"
 msgstr "Izmērs"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Pasts"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Ej uz priekšu"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Avota Informācija:"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Pārsūtīt"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Atbildēt"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Atbildēt Visiem"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Pirmsapskats"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13326,16 +13562,16 @@ msgstr "Parakstīties uz mapi \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Atrakstīties no mapes \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mape"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
@@ -18176,11 +18412,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24113,8 +24349,8 @@ msgstr "Nav apraksta"
 msgid "Mail summary"
 msgstr "Pasta kopsavilkums"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokālās Mapes"
 
@@ -24132,16 +24368,16 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Dienas Vārds"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Dienas Citāti"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Pievienot"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 #, fuzzy
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "URL"
@@ -24155,26 +24391,26 @@ msgstr "Kļūda lejuplādējot RDF"
 msgid "News Feed"
 msgstr "Ziņas"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Pievieno_t"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Lietavas"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Nav uzdevumu"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Nav Apraksta)"
 
@@ -25451,7 +25687,8 @@ msgid "Tasks "
 msgstr "Uzdevumi"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Laikapstākļu uztādījumi"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25509,7 +25746,7 @@ msgstr "Parādīt Detaļas"
 msgid "Cancel Operation"
 msgstr "Atsaukt Operāciju"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25523,20 +25760,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Izvēlēties Mapi"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Melnraksti"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Outbox"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Nosūtīts"
 
@@ -25776,22 +26013,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Izveidot jaunu mapi"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Izvēlētās mapes tips neder\n"
-"pieprasītajai operācijai."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Izveidot _Jaunu Mapi..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Jauns..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
 
@@ -25813,7 +26043,7 @@ msgstr ""
 "Jūs varat izvēlēties \"Automātiski\" ja jūs precīzi nezinat un Evolution "
 "mēģinās to noteikt."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Lūdzu izvēlieties informāciju, ko jūs vēlētos importēt:"
 
@@ -25844,21 +26074,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izvēlēties Mapi"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution Kļūda "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Jūs varat tikai importēt uz lokālajām mapēm"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25867,11 +26093,11 @@ msgstr ""
 "Nav importētāja kurš spētu tikt galā ar\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importējam"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25880,17 +26106,17 @@ msgstr ""
 "Importējam %s.\n"
 "Sākam %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Kļūda sāknējot %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Kļūda ielādējot %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25899,31 +26125,31 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importēt vienu failu"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25931,24 +26157,24 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Skannējam jau eksistējošajiem uzstādijumiem"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Startējam Inteliģentos Importētājus"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Izvēlieties gala mērķa direktoriju lai importētu šos datus"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importēt"
 
@@ -25996,9 +26222,14 @@ msgstr "Atveram mapi %s"
 msgid "in \"%s\" ..."
 msgstr "Atvērt ar %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nevar atvērt mapi uz `%s'"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Nevar izveidot norādīto mapi:\n"
 "%s"
@@ -26016,8 +26247,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nevarēja startēt Evolution Pastnieka Asistenta interfeisu\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Jauna"
@@ -26058,58 +26289,59 @@ msgstr "Ej uz mapi..."
 msgid "Select the folder that you want to open"
 msgstr "Izvēlies mapi kuru tu vēlies atvērt"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Izveidot jaunu saīsinājumu"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izvēlieties mapi uz kuru jūs gribat saīsinājumu:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Strādāt Tiešsaistē"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Strādāt Nesaistē"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Strādāt Nesaistē"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nav atēlota mape)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Nekas)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
 "netiešsaistē."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution ir nesaistes režīmā iešanas procesā."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs pogas lai "
 "strādātu tiešsaistē."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26121,12 +26353,12 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nevar uzstādīt vietējo glabātuvi -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26137,31 +26369,31 @@ msgstr ""
 "ir pēkšņi aizvēries. Jums vajadzēs Evolution un pārstartēt\n"
 "lai tiktu atkal pie datiem."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju Datubāze nav atrasta"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Grupas nosaukums:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26170,107 +26402,117 @@ msgstr ""
 "Vai jūs patiešām vēlaties izņemt grupu\n"
 "`%s' no saīsinājumu joslas?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nepārvietot"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Pārdēvēt Saīsinājumu Grupu"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu grupu par:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Mazas Ikonas"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Parādīt saīsinājumus kā mazas ikonas"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Lielas Ikonas"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Parādīt saīsinājumus kā lielas ikonas"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Jauna Grupa..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Izņemt šo Grupu..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Izņemt šo saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Pārsaukt šo Grupu..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Pārdēvēt saīsinājumu grupu"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Paslēpt Saīsinājumu Joslu"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Paslēpt saīsinājumjoslu"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Izveidot jaunu saīsinājumu"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Izveidot jaunu saīsinājumu"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Pārdēvēt saīsinājumu"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Pārdēvēt izvēlēto saīsinājumu par:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Atvērt mapi saistītu ar šo saīsinājumu"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Atvērt _Jaunā Logā"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Pārdēvēt šo saīsinājumu"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Izņemt"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Izņemt šo saīsinājumu no saīsinājumu joslas"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Kļūda glabājot saīsinājumus."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Saīsinājumi"
 
@@ -26279,55 +26521,55 @@ msgstr "Saīsinājumi"
 msgid "Checkbox"
 msgstr "Krēsls"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Nav kļūdas"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Mape ar šadu nosaukumu jau eksistē"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Norādītais mapes tips nav pareizs"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O kļūda"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Nav pietiekami vietas, lai izveidotu mapi"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Mape nav tukša"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Norādītā mape netika atrasta"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funkcija nav implementēta šajā glabātuvē"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operācija nav atbalstīta"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Norādītais tips nav atbalstīts šajā glabātuvē"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Norādītā mape nevar tikt mainīta vai izņemta"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Nevar izveidot mapi ar šādu nosaukumu"
 
@@ -26382,63 +26624,63 @@ msgstr ""
 "Kļūda no aktivizēšanas sistēmas ir:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "COBRA kļūda"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Pārtraukts"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Nepareizs arguments"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Jau ir īpašnieks"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Nav īpašnieka"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nav atrasts"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Neatbalstīts tips"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Neatbalstīta shēma"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Neatbalstīta operācija"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Iekšēja kļūda"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Izejam"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Nepareizs URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Ir apakšmapes"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Nav brīvas vietas"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Vecais īpašnieks ir 'miris'"
 
@@ -26464,6 +26706,26 @@ msgstr "Resursdators"
 msgid "The following connections are currently active:"
 msgstr "Pašreizējie aktīvie savienojumi ir:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalendārs"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakti:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pasts"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Uzdevumi"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mapes nosaukums:"
@@ -26476,6 +26738,34 @@ msgstr "Mapes tips:"
 msgid "Specify where to create the folder:"
 msgstr "Norādīt šeit, lai izveidotu mapi:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Izveidot _Jaunu Mapi..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Mapes nosaukums:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Servera nosaukums:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Lietotājvārds:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Uzstādīšanas Asistents"
@@ -26572,15 +26862,15 @@ msgstr "Neprasiet man vēlreiz"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution tagad iziet ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26600,53 +26890,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Neprasiet man vēlreiz"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nevar atvērt Ximian Evolution čaulu."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nevar initializēt Ximian Evolution čaulu: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Deaktivizēt splash ekrānu"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Sākam importu"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startējam Inteliģentos Importētājus"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nevar initializēt Bonobo komponentu sistēmu."
 
@@ -26683,116 +26973,110 @@ msgstr "Kopēt izvēlēto"
 msgid "Copy to Folder..."
 msgstr "_Kopēt uz Mapi..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Izveidot jaunu kontaktu"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Izveidot jaunu kontaktu sarakstu"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Izgriezt izvēlēto"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Dzēst izvēlētos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Pārvietot izvēlētās vēstules uz citu mapi"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Ievietot starpliktuves saturu"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Apskatīt drukājamos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Drukāšanas _Pirmsapskats"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Drukāt izvēlētos kontaktus"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Saglabāt izvēlētos kontaktus kā VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izvēlēties Visus"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Izvēlēties visus kontaktus"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Sūtīt mesi izvēlētajiem kontaktiem."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Sūtīt izvēlētos kontaktus citai personai."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Apstādināt Ielādi"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "pašreizējais laiks"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Darbības"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktu Saraksts"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Pārsūtīt Kontaktu..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Pārvietot uz _Mapi..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Saglabāt kā VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Meklēt Kontaktus"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Izvēlēties Visu"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Sūtīt _Vēstuli Kontaktam..."
@@ -26837,11 +27121,6 @@ msgstr "Mēnesis"
 msgid "Previews the calendar to be printed"
 msgstr "Parāda kalendāru, kāds tas tiks drukāts"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Drukāšanas _Pirmsapskats"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Drukāt šo kalendāru"
@@ -26874,7 +27153,7 @@ msgstr "Nedēļa"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -26887,7 +27166,7 @@ msgid "Delete this item"
 msgstr "Dzēst šo priekšmetu"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Galvenā rīkjosla"
 
@@ -26899,8 +27178,8 @@ msgstr "Apskatīt drukāto priekšmetu"
 msgid "Print this item"
 msgstr "Drukāt šo priekšmetu"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -26925,9 +27204,9 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fails"
 
@@ -26937,7 +27216,7 @@ msgstr "Drukāt Ap_loksni..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Nogl_abāt Kā..."
 
@@ -26951,8 +27230,8 @@ msgstr "Sūtīt _Vēstuli Kontaktam..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "N_oglabāt"
 
@@ -27049,26 +27328,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Nekavējoties izņemt visas izdzēstās vēstules no visām mapēm"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Jauna Vēstule"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Saglabājam vēstuli mapē"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Parādīt vēstules pirmsapskata logu"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Pierakstīties vai atrakstīties uz/no mapēm uz attālinātajiem serveriem"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Virtuālās Mapes R_edaktors..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Apskata Lauks"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_"
 
@@ -27167,7 +27456,7 @@ msgstr "Sasaistīts Vēstuļu saraksts"
 msgid "_Expunge"
 msgstr "_Izdzēst"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Mape"
 
@@ -27428,181 +27717,196 @@ msgstr "Iepriekšējā Neizlasītā Vēstule"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Uzdevuma Atbilde"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Pārbaudam jaunas vēstules visās mapēs"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Iepriekšējā Svarīgā Vēstule"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Apskatīt vēstuli pirms drukāšanas"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Iepriekšējā"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Drukāt šo vēstuli"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Pārsūtīt izvēlēto vēstuli kādam"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Atsaukt tekstu oriģinālajā izmērā"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "M_eklēt Vēstuli..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Mazāks"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Saglabāt vēstuli kā teksta failu"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Meklēt tekstu attēlotajā vēstules rumpī"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Uzstādīt lapas uzstādijumus tavam pašreizējam printerim"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Parādī Epasta _Avotu"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Parādīt _Pilnu Iesākumus"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Parādīt vēstuli normālā stilā"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Parādīt vēstuli ar visiem epasta iesākumiem"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Parādīt pamata vēstules epasta avotu "
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Teksta _Izmērs"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Atdzēst izvēlētās vēstules"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VMape uz Pasta _Saraksti..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VMape uz Sūtītāju..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VMape uz _Saņēmējiem..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VMape pēc Subjekta..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Pievienot"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz Mapi"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Izveidot Filtru No Vēstules"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Pārsūtīt Vēstuli"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Ej Uz "
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Iekļauts"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Lielāks"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Vēstules Attēlošana"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz Mapi"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Nākošā Vēstule"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normāla Attēlošana"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Atvērt Vēstuli"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Iepriekšējā Vēstule"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citēts"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Pā_rsaukt..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Rīki"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Atdzēst"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Skatīt"
 
@@ -27630,169 +27934,161 @@ msgstr "Kodēt šo vēstuli ar tavu S/MIME Kodēšanas Sertifikātu"
 msgid "For_mat"
 msgstr "For_māts"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Iekļautais Teksta Fails..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Ievietot failu kā tekstu vēstulē"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Ievietot teksta failu..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Atvērt"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Atvērt failu"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP Kodējums"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP Paraksts"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME Kodējums"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME Paraksts"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Saglabāt Kā"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Saglabāt _Melnrakstā"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Saglabāt mapē..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Saglabāt pašreizējo failu"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Saglabāt pašreizējo failu ar citu nosaukumu"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Saglabāt vēstuli norādītajā mapē"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Sūtīt"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Sūtīt _Vēlāk"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Sūtīt _vēlāk"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Sūtīt pastu HTML formātā"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Sūtīt vēstuli vēlāk"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Sūtīt šo vēstuli tagad"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Parādīt / slēpt pievienojumus "
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "P_arādīt pievienojumus"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Parādīt pievienojumus"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Parakstīt šo vēstuli ar jūsu PGP atslēgu"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Parakstīt šo vēstuli ar jūsu S/MIME Paraksta Sertifikātu"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Norāda, vai BBC lauks tiek attēlots"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Parāda, vai CC lauks tiek attēlots"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Parāda, vai No izvēlne tiek parādīta"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Parāda, vai Atbildēt-Uz lauks tiek parādīts"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Pievienojums..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc Lauks"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc Lauks"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Dzēst visu"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_No Lauka"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Ievietot"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Atvērt"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_tbildēt-_Uz Lauks"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Saglabāt šo priekšmetu un aizvērt dialoga logu"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Palīdzība"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Saglabāt parakstu"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Pievienot mapi jūsu pierakstīto mapju sarakstam"
@@ -27890,171 +28186,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Pievienot _Saīsinājumikonu Joslai"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Izmainīt šīs mapes nosaukumu"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopēt šo mapi"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Izveidot _Jaunu Mapi..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "saīsinājumikonu joslā izveidot saiti ar šo mapi"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Izveidot jaunu mapi"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Izveidot jaunu saīsinājumu"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Izveidot jaunu mapi"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Dzēst šo mapi"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Parādīt citu mapi"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "I_ziet"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _Logs"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Iziet no programmas"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importēt datus uz citām programmām"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Pārvietot šo mapi uz citurieni"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Izveidot _Jaunu Mapi..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Atvērt Jaunā Logā"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Atvērt šo mapi citā logā"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot Uzstādījumi..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindoto pastu un saņemt jaunu pastu"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Pasta Konfigurācija"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Norādīt"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Parādīt izvēlēto mapi"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution VUJ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Par Ximian Evolution"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopēt"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Mapes Josla"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mape"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Iet Uz Mapi..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Pārvietot..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Jauna Mape"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot Uzstādījumi..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Bez A_tkārtošanās"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "Pā_rsaukt..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "Ī_sinājumikona"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Ī_sinājumikonas Josla"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "Ī_sinājumikona"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Drukāt Kopsavilkumu"
@@ -28068,17 +28395,40 @@ msgid "Reload the view"
 msgstr "Pārlādēt skatu"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adrešu Kartes"
+#, fuzzy
+msgid "By _Company"
+msgstr "Pēc Kompānijas"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Pēc Kompānijas"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adrešu Kartes"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonu Saraksts"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Nedēļas Skats"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dienas Skats"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Mēneša Skats"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Darba Nedēļas Skats"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28104,13 +28454,19 @@ msgstr "Pēc Subjekta"
 msgid "Messages"
 msgstr "Vēstules"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Ar Kategoriju"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Uzdevums"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28264,11 +28620,11 @@ msgstr "Rakstzīmju Šifrēšana"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Meklēšanas Redaktors"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Saglabāt Meklēšanu"
 
@@ -28308,21 +28664,21 @@ msgstr "Vēstule"
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Atrast Tagad"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Tīrs"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Atrast Tagad"
 
@@ -28336,18 +28692,156 @@ msgstr "Personālais Adrešu Grāmatas Serveris"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personālais Kalendāra Serveris, kalendāra ražotne"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nevar initializēt  GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nevar initializēt GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nevar initializēt Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution nevar dabūt adrešu grāmatas lokālo glabatuvi.\n"
+#~ "Tas varētu būt tādēļ, ka evolution-adressbook komponents nokārās.\n"
+#~ "Lai palīdzētu mums labāk izprast un ātri atrisināt šo problēmu,\n"
+#~ "lūdzu sūtiet epastu Jon Trowbridge <trow@ximian.com> ar\n"
+#~ "detalizētu apstākļu aprakstu, pie kuriem kļūda\n"
+#~ "parādijās. Paldies."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution nevar dabūt adrešu grāmatas vietējo glabātuvi.\n"
+#~ "Normālos apstākļos tam nekad nevajadzētu notikt.\n"
+#~ "Jums vajag iziet un pārstartēt Evolution lai atrisinātu\n"
+#~ "šo problēmu."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Pārvietot..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Satikšanās statuss ir izmainīts. Nosūtīt atjaunināto versiju?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Dzēst šo Tikšanos"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O kļūda"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Apsveikuma atbildes kļūda: %s: iespējami ne fatāla"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO pieprasījums iztecējis: %s: ne fatāli"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO atbildes kļūda: %s: ne fatāli"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT pieprasījums iztecējis: %s: ne fatāli"
+
+#~ msgid "Insert File"
+#~ msgstr "Ievietot failu"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Jūs esat izvēlējies nepareizu datumu."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Vēstules datums tiks salīdzināts ar\n"
+#~ "laiku, ka tiks palaists filtrs vai\n"
+#~ "vmape atvērta."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution Ziņu Redaktors"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst ziņu kontu?"
+
+#, fuzzy
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "pirms."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Serveris:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Ziņas"
+
+#~ msgid "Source"
+#~ msgstr "Avots"
+
+#~ msgid "Source Information"
+#~ msgstr "Avota Informācija:"
+
+#~ msgid "newswindow1"
+#~ msgstr "zinulogs1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Saglabāt uz Diska..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Saglabāt Vēstuli Kā..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Izveidot jaunu mapi"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Izvēlētās mapes tips neder\n"
+#~ "pieprasītajai operācijai."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Jūs varat tikai importēt uz lokālajām mapēm"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktu Saraksts"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Iekļautais Teksta Fails..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Ievietot failu kā tekstu vēstulē"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Ievietot teksta failu..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Sūtīt _Vēlāk"
+
+#~ msgid "Send _later"
+#~ msgstr "Sūtīt _vēlāk"
+
+#~ msgid "Send the message later"
+#~ msgstr "Sūtīt vēstuli vēlāk"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot Uzstādījumi..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adrešu Grāmatas Resursi"
@@ -28468,10 +28962,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgstr "Somerseta"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Paraksta fails:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Izdzēst visu, bet ne parakstu"
 
@@ -28845,12 +29335,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Moldovas Republika"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Ievietot jaunu ierakstu par satikšanos"
-
-#~ msgid "Create a new task"
-#~ msgstr "Ievietot jaunu uzdevumu"
-
 #~ msgid "New _Task"
 #~ msgstr "Jauns _Uzdevums"
 
@@ -28991,9 +29475,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Pasta glabāšanas mape (iekšējā)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Nevar savienoties ar glabātuvi: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Jauns Pasta Ziņoju_ms"
 
@@ -29043,9 +29524,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizācija:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Atceries šo paroli"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Sūtīt pastu HTML formātā pēc noklusējuma"
 
@@ -29126,9 +29604,6 @@ msgstr "init_bonobo(): nevar initializēt Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Izveidot vai rediģēt pasta kontus un citas preferences"
 
-#~ msgid "New Message"
-#~ msgstr "Jauna Vēstule"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_Pasta uzstādījumi"
 
diff --git a/po/nl.po b/po/nl.po
index 93077203e8..91859a8ee4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 1\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-04-01 04:27+02:00\n"
 "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "Importeert GnomeCard bestanden in Evolution."
 msgid "File As"
 msgstr "Opslaan Als:"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Naam"
@@ -351,46 +351,46 @@ msgstr "Vkaart voor %s"
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Fout in zoekopdracht."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Kaart wordt toegevoegd aan LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Kaart wordt verwijderd van LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Kaart van LDAP server wordt aangepast..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Zoeken wordt herstart."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP zoekresultaten komen binnen..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "kon URL %s niet verwerken"
@@ -483,11 +483,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Adresboek"
 
@@ -503,22 +503,31 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server met contactinformatie"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nieuw Contact"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "C_ontacten...."
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Nieuw contact maken"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nieuwe Contactenlijst"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Contacten _Lijst"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nieuw Contact"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "C_ontacten...."
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Maak een nieuwe contactenlijst"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -542,30 +551,30 @@ msgstr "kon URL %s niet verwerken"
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL wordt niet ondersteund in deze versie van Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Kon Gnome-vfs niet initialiseren"
 
@@ -573,11 +582,11 @@ msgstr "Kon Gnome-vfs niet initialiseren"
 msgid "Other Contacts"
 msgstr "Andere Adresboeken"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -587,7 +596,7 @@ msgstr ""
 "u een ongeldige URI heeft opgegeven of de LDAPserver\n"
 "down is."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -599,7 +608,7 @@ msgstr ""
 "moet u het programma vanuit de CVS sources meecompileren\n"
 "nadat u OpenLDAP van de link hierbeneden heeft opgehaald.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -607,44 +616,44 @@ msgstr ""
 "Kan het adressenboek niet openen.  Controleer of het pad bestaat\n"
 "en of u het mag benaderen."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Voer uw wachtwoord in voor %s (gebruiker %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "eindigt op"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Elk veld bevat"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Elke Categorie"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Mapbladeraar zal laten zien"
 
@@ -766,7 +775,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adresboekbronnen"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -863,8 +872,8 @@ msgstr "Configuratie"
 msgid "Mappings"
 msgstr "Marges"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_elke"
@@ -918,8 +927,8 @@ msgstr "Zoek_gebied: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Zoeken"
 
@@ -1117,15 +1126,15 @@ msgid "Using email address"
 msgstr "Emailadres"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Toevoegen"
 
@@ -1173,12 +1182,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "_Downloadlimiet"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "B_ewerken..."
@@ -1294,10 +1303,10 @@ msgstr "Factory voor de naamselectie-interface van het Adresboek"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1326,43 +1335,15 @@ msgstr "(%d niet weergegeven)"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Selecteer Contacten uit het Adresboek"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Verzender bevat"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution kan het lokale adresboek niet benaderen.\n"
-"Dit kan veroorzaakt zijn door het crashen van de adresboek component.\n"
-"Om ons te helpen dit probleem te begrijpen en op te lossen zou u\n"
-"een engelstalige email kunnen sturen aan Jon Trowbridge <trow@ximian.com>\n"
-"met een gedetailleerde beschrijving van de omstandigheden waaronder\n"
-"deze fout zich voordeed. Heel erg bedankt."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution kan het lokale adresboek niet benaderen.\n"
-"Dit mag nooit gebeuren onder normale omstandigheden.\n"
-"U zult waarschijnlijk Evolution moeten sluiten en weer starten\n"
-"om het probleem te verhelpen."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Selecteer Contacten uit het Adresboek"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Selecteer namen"
@@ -1384,15 +1365,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "Verplaatsen..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Map:"
 
@@ -1497,11 +1473,12 @@ msgstr "Bij voorkeur _HTML-berichten"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -2735,7 +2712,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Verberg de adressen bij het sturen van post naar deze lijst"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Ve_rwijderen"
 
@@ -2798,7 +2775,7 @@ msgstr ""
 "in deze map. Wilt u het toch toevoegen?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
@@ -2825,21 +2802,21 @@ msgid "Error getting book view"
 msgstr "Fout bij weergave boekvorm"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -2847,8 +2824,8 @@ msgstr "Onbekende fout"
 msgid "Repository offline"
 msgstr "Opslagplaats offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
@@ -2865,7 +2842,7 @@ msgid "Protocol not supported"
 msgstr "Protocol niet ondersteund"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2888,46 +2865,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Map %s bestaat niet"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Onbekende fout"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Wilt u de wijzingen opslaan?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Fout bij toevoegen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Fout bij aanpassen ljist"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fout bij verwijderen kaart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Kaarten weergeven?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Kaarten weergeven"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2938,19 +2920,19 @@ msgstr ""
 "d\n"
 "nieuwe vensters worden geopend. Wilt u deze werkelijk allemaal openen?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Verplaats kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopieer kaart naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Verplaats kaarten naar"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopieer kaarten naar"
 
@@ -3022,7 +3004,7 @@ msgstr "Adresboek"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
@@ -3062,7 +3044,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot Instellingen..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Stuur Contact Door"
 
@@ -3071,8 +3053,8 @@ msgid "Send Message to Contact"
 msgstr "Stuur Bericht aan Contact..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Afdrukken"
@@ -3090,7 +3072,7 @@ msgid "Move to folder..."
 msgstr "Verplaatsen naar Map..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Knippen"
 
@@ -3101,20 +3083,20 @@ msgid "Copy"
 msgstr "Kopi�ren"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Huidige Weergave"
@@ -3279,7 +3261,7 @@ msgstr "Marges"
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opties"
 
@@ -3369,26 +3351,26 @@ msgstr "Afspraak zonder titel"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Hoog"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Laag"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Ongedefinieerd"
@@ -3510,11 +3492,11 @@ msgstr "Sluimertijd (minuten)"
 msgid "_Edit appointment"
 msgstr "_Afspraak bewerken"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3526,13 +3508,13 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3549,7 +3531,7 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
@@ -3577,7 +3559,7 @@ msgstr "Omschrijving bevat"
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Niet passend"
 
@@ -3588,7 +3570,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3610,17 +3592,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Kalenderweergave mislukt.  Controleer uw ORBit en OAF instellingen."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Priv�"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Vertrouwelijk"
@@ -3645,37 +3627,37 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Vrij"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Bezig"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Niet Gestart"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "In Uitvoer"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Voltooid"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3686,56 +3668,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Toegewezen"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nee"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dag Weergave"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Werkweek Weergave"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Week Weergave"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Maand Weergave"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3743,12 +3724,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Folder met afspraken en gebeurtenissen"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Taken"
 
@@ -3756,39 +3737,56 @@ msgstr "Taken"
 msgid "Folder containing to-do items"
 msgstr "Map met to-do items"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nieuwe afspraak"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Afspraak"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Maak een nieuwe afspraak"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Vergadering"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Maak een nieuw bijeenkomstverzoek"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Nieuwe taak aanmaken"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nieuwe afspraak"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Afspraak"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Maak een nieuwe afspraak"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3857,7 +3855,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dagen"
 
@@ -3865,11 +3864,13 @@ msgstr "dagen"
 msgid "extra times every"
 msgstr "nogmaals"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "uren"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minuten"
 
@@ -3997,7 +3998,7 @@ msgstr "Herinneringen"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -4026,7 +4027,7 @@ msgstr "einde van afspraak"
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4204,7 +4205,7 @@ msgid "_Fri"
 msgstr "_Vrij"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Algemeen"
 
@@ -4249,21 +4250,33 @@ msgstr "_Woe"
 msgid "before every appointment"
 msgstr "voor het begin van de afspraak"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
-"De status van de bijeenkomst is veranderd. Een geactualiseerde versie "
-"versturen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Weet u zeker dat u deze vergadering wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Weet u zeker dat u deze taak wilt annuleren en verwijderen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Weet u zeker dat u dit dagboek item wilt annuleren en verwijderen?"
 
@@ -4334,61 +4347,61 @@ msgstr " (Verloopt "
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Ophalen huidige versie mislukt!"
 
@@ -4587,7 +4600,7 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4599,7 +4612,7 @@ msgstr "Rol"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4684,7 +4697,7 @@ msgstr "op"
 msgid "first"
 msgstr "lijst"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "seconde"
 
@@ -4708,7 +4721,7 @@ msgstr "lijst"
 msgid "Other Date"
 msgstr "Andere Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
@@ -4806,20 +4819,26 @@ msgstr "% Vo_ltooid:"
 msgid "Date Completed:"
 msgstr "Voltooiingsdatum:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Heeft Actie Nodig"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Voortgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -4833,7 +4852,7 @@ msgstr "Basis"
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4902,80 +4921,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopi�ren"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Taak Toewijzen"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markeer de Taken als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
@@ -4984,8 +5003,8 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "Alarms"
 msgstr "Alarmen"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Voltooid"
 
@@ -5013,11 +5032,9 @@ msgstr "Prioriteit"
 msgid "Start Date"
 msgstr "Begindatum"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Samenvatting"
 
@@ -5059,111 +5076,110 @@ msgstr "%02i minuten delingen"
 
 #. 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nieuwe _Afspraak"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Afdrukken..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configureer %s"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configureer %s"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Opslaan Als..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Doorsturen als i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Maak deze Gebeurtenis Verplaatsbaar"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Het gereedschap voor GNOME Pilot lijkt niet ge�nstalleerd te zijn."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Fout bij uitvoeren filter %s."
@@ -5204,7 +5220,7 @@ msgstr " (Taak Voltooid: <b>"
 msgid "Task Due: <b>"
 msgstr "Taak klaar: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
@@ -5213,12 +5229,12 @@ msgstr "iCalendar Informatie"
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5226,322 +5242,327 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Geografische Locatie: "
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Er trad een fout op bij het downloaden van gegevens voor"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecteer Map"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecteer Map"
@@ -5587,7 +5608,7 @@ msgstr "begindatum"
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Vereiste Deelnemers"
 
@@ -5600,57 +5621,52 @@ msgid "Non-Participants"
 msgstr "Niet-Deelnemers"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Persoon"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Groep"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Hulpbron"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Kamer"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Voorzitter"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Vereiste Deelnemer"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Optionele Deelnemer"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Niet-Deelnemer"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Heeft Actie Nodig"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Voorlopig"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Overgedragen"
 
@@ -5740,48 +5756,45 @@ msgstr "Aanvang _bijeenkomst:"
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kon de taken in `%s' niet laden"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te laden wordt niet ondersteund"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Kon de map in `%s' niet openen"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Bezig met Schrappen"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Verwijder deze Afspraak"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5792,11 +5805,16 @@ msgstr "Kon de map in `%s' niet openen"
 msgid "The method required to open `%s' is not supported"
 msgstr "De methode die nodig is om `%s' te openen word niet ondersteund"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Bezig met openen kalender op %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Bezig met openen map %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5853,53 +5871,58 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Er is minstens ��n bezoeker nodig"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Gebeurtenis informatie"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Taak informatie"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Journaal informatie"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Vrij/Bezet informatie"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformatie"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Verversen"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Lijst Verversen"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Kon Bonobo niet initialiseren"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Cre�eren van de component editor factory is mislukt"
 
@@ -6126,9 +6149,8 @@ msgid "Print Calendar"
 msgstr "Kalender afdrukken"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -6162,8 +6184,8 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
@@ -6226,17 +6248,29 @@ msgstr "Importeert iCalendat bestanden in Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importeert vCalendar bestanden in Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Kon niet verbinden met de opslag: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Herinnering"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalenderbericht"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6245,84 +6279,84 @@ msgstr ""
 "Evolution heeft Pine mailbestanden gevonden.\n"
 "Wilt u deze importeren naar Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time verwacht 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time verwacht dat argument 1 een string is"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time argument 1 moet een ISO-8601 date/time string zijn"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day verwacht 2 argumenten"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day verwacht dat argument 2 een integer is"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin verwacht 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-bewgin verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-dat-end verwacht 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-dat-end verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype verwacht geen argumenten"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? verwacht 2 argumenten"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? verwacht dat argument 2 een time_t is"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "Bevat? verwacht 2 argumenten"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? verwacht dat argument 1 een string is"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? verwacht dat argument 2 een string is"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6330,11 +6364,11 @@ msgstr ""
 "contains? verwacht dat argument 1 een kleuze is uit \"any\",\"summary\","
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? verwacht op zijn minst 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6342,19 +6376,19 @@ msgstr ""
 "has-categories? verwacht dat alle argumenten strings zijn, of dat slechts "
 "een argument booleaans onwaar is (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? verwacht 0 argumenten"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? verwacht 1 argumenten"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? verwacht dat argument 1 een time_t is"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluation of the search expression did not yield a boolean value"
 
@@ -7951,71 +7985,81 @@ msgstr "Bezig met opslaan map '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "U moet online werken om deze bewerking te voltooien"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Bezig met synchroniseren map"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Ophalen bericht mislukt"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Ongeldige argumenten"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Ongeldige argumenten"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
@@ -8071,7 +8115,7 @@ msgstr "Verplaatsen van berichten"
 msgid "Copying messages"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8079,47 +8123,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Geen bestandsnaam opgegeven."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan dit bericht niet versleutelen: er zijn geen ontvangers opgegeven"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8127,18 +8171,18 @@ msgid ""
 "%.*s"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Faalde bij cachen bericht %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Decoderen van bericht mislukt."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kan dit bestand niet verifi�ren: kon geen tijdelijk bestand maken: %s"
@@ -8164,24 +8208,24 @@ msgid "Could not lock '%s'"
 msgstr "Kon niet vergrendelen: '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kon vergrendelingsbestand voor %s niet maken: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Maximale wachttijd overschreden tijdens het wachten op exclusieve toegang "
 "tot bestand %s. Probeer het later opnieuw."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
@@ -8240,11 +8284,16 @@ msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fout bij opslaan van tijdelijk postbusbestand: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Kan bericht niet decoderen: Onbekende fout"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Kan bericht niet decoderen: Onbekende fout"
@@ -8380,7 +8429,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -8559,33 +8608,134 @@ msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Verifi�ren van certificaten mislukt."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Issuer: %s\n"
-"Onderwerp: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Verifi�ren van certificaten mislukt."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Handtekeningbestand:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Certificaat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Fout bij laden %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Afwezig"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
 msgstr ""
-"Fout certificaat van %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Wil je het alsnog accepteren?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Verifi�ren van certificaten mislukt."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Certificaat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ongeldige argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Certificaat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Certificaat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8598,16 +8748,33 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "SLECHT"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Fout certificaat van %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Wil je het alsnog accepteren?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8627,32 +8794,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Fout bij laden %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Controleer op nieuwe berichten in alle mappen"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
@@ -8660,12 +8832,12 @@ msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -8694,40 +8866,40 @@ msgstr "Het antwoord van de IMAP-server bevatte geen %s informatie"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP-server gaf onverwacht een 'OK' antwoord: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Bezig met zoeken naar nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -8736,10 +8908,10 @@ msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 msgid "Could not open cache directory: %s"
 msgstr "Kon cache map %s niet openen"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Faalde bij cachen bericht %s: %s"
@@ -8752,7 +8924,7 @@ msgstr "Controleren voor nieuwe email"
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe berichten in alle mappen"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mappen"
 
@@ -8782,7 +8954,7 @@ msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -8792,73 +8964,77 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s dienst voor %s op %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operatie niet ondersteund"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Aanmelding mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "De map is niet leeg"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8869,31 +9045,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mapnaam kan geen enter-teken bevatten."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Kon postbus niet openen: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8915,7 +9097,10 @@ msgid "Local delivery"
 msgstr "Lokale bezorging"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Voor het ophalen van lokale post uit standaard spools in mbox-formaat."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8943,13 +9128,13 @@ msgstr "Standaard Unix mbox spools"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Voor het lezen en opslaan van lokale post in standaard mbox spool bestanden."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8960,38 +9145,38 @@ msgstr "Opslaglocatie %s is geen absoluut pad"
 msgid "Store root %s is not a regular directory"
 msgstr "Opslag `%s' is geen normale directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokale opslaglocaties hebben geen postbus-in"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokaal postbusbestand %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kon indexbestand van map `%s' niet verwijderen: %s"
@@ -9051,7 +9236,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9089,26 +9274,26 @@ msgstr "geen maildir-directory"
 msgid "Could not scan folder `%s': %s"
 msgstr "Kon map `%s' niet scannen: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kon maildir directory path niet openen: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Controleren voor nieuwe email"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Bezig met zoeken naar nieuwe berichten"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Bezig met opslaan map"
@@ -9152,7 +9337,7 @@ msgstr "De map lijkt onherstelbaar beschadigd te zijn."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9161,7 +9346,7 @@ msgstr ""
 "Kon bestand `%s' niet openen:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9170,14 +9355,14 @@ msgstr ""
 "Kon bestand `%s' niet aanmaken:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' is geen normaal bestand."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9186,7 +9371,7 @@ msgstr ""
 "Kon map `%s' niet verwijderen:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
@@ -9201,64 +9386,64 @@ msgstr "Kon map: %s niet openen: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale email-interpreatiefout op positie %ld in map %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan map %s niet controleren: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kon bestand: %s niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijke postbus niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, 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:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postbus %s: %s"
@@ -9409,47 +9594,47 @@ msgstr "Gebruik annuleren"
 msgid "Operation failed: %s"
 msgstr "Bewerking mislukt: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP-samenvatting aan het ophalen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Gebruiker geannuleerd"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan POP-samenvatting niet verkrijgen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Bezit met schrappen van verwijderde berichten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Bezig met ophalen POP-bericht %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan bericht: %s niet verkrijgen: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
@@ -9466,7 +9651,7 @@ msgstr "Laat de berichten op de server achter"
 msgid "Delete after %s day(s)"
 msgstr "Verwijder na %s dag(en)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9494,6 +9679,11 @@ msgstr ""
 "wachtwoord via het APOP-protocol. Deze optie zal niet werken voor alle "
 "gebruikers, zelfs niet op servers die beweren het te ondersteunen."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Kon niet verbinden met %s (poort %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9505,54 +9695,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Kon niet verbinden met POP-server op %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldingsmethode."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Inloggen mislukt: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL Protocol fout"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "I/O Fout: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Kon niet verbinden met POP-server op %s."
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVoer het POP3-wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9578,35 +9770,35 @@ msgstr "Kon verbinding met sendmail niet maken: %s: bericht niet verstuurd"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kon sendmail niet starten: %s: bericht niet verstuurd"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kon bericht niet versturen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail stopte met signaal %s: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail stopte met staat %d: bericht niet verstuurd."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9714,45 +9906,45 @@ msgstr "Tijdelijke aanmeldingsfout"
 msgid "Authentication required"
 msgstr "Aanmelding is vereist"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "'Welkom respons'-fout: %s: waarschijnlijk niet-fataal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Fout bij QUIT-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Fout bij verbinden met de POP-server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVoer het SMTP wachtwoord in voor %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9763,88 +9955,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Bezig met versturen bericht"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "'HELO respons'- fout: %s: niet-fataal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Time-out tijdens RSET-verzoek: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH verzoek faalde"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'MAIL FROM'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "Fout bij 'MAIL FROM'-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Time-out tijdens 'RCPT TO'-verzoek: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
@@ -9852,88 +10044,88 @@ msgstr "Time-out tijdens DATA-verzoek: %s: bericht niet verstuurd"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Fout bij DATA-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Time-out tijdens het versturen van DATA: bericht afgebroken: %s: bericht "
 "niet verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "DATA terminatie foutmelding."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Time-out tijdens RSET-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "Fout bij RSET-respons"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Time-out tijdens QUIT-verzoek: %s: niet-fataal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Time-out tijdens AUTH-verzoek: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "Fout bij QUIT-respons"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "bijlage"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 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:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan bestand %s niet bijvoegen: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan bestand %s niet bijvoegen: geen normaal bestand"
@@ -9951,56 +10143,60 @@ msgid "MIME type:"
 msgstr "MIME type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Van:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Antwoordadres:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Van:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Aan:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10008,17 +10204,25 @@ msgstr ""
 "Geef de adressen die een kopie van het bericht moeten krijgen zonder dat ze "
 "op de geadresseerden-lijst van het bericht verschijnen."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Voeg een bestand toe als bijlage"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kon geen PGP handtekening-context maken"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10027,34 +10231,34 @@ msgstr ""
 "Fout bij lezen bestand %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Waarschuwing"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fout bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fout bij benaderen bestand: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Kon bericht niet van editor halen"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10063,7 +10267,7 @@ msgstr ""
 "Niet in staat te zoeken op bestand: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10072,7 +10276,7 @@ msgstr ""
 "Niet in staat om bestand: %s af te kappen\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10081,7 +10285,7 @@ msgstr ""
 "Fout bij automatisch opslaan bericht: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10090,7 +10294,7 @@ msgstr ""
 "gevonden.\n"
 "Wilt u dat deze hersteld worden?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10100,43 +10304,39 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Bestand openen"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Bestand Invoegen"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Bewaar handtekening"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (standaard)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Stel een nieuw bericht op"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10144,7 +10344,7 @@ msgstr ""
 "Kon het venster Opstellen niet aanmaken:\n"
 "Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10152,9 +10352,9 @@ msgstr ""
 "Kon het venster voor het opstellen van het bericht niet maken:\n"
 "Niet in staat de HTML editor component te activeren."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10219,8 +10419,8 @@ msgstr "Onderwerp bevat"
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10228,12 +10428,11 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Onthoud dit wachtwoord tot het einde van deze sessie"
 
@@ -10331,150 +10530,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "jaar"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "jaren"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "seconden"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "maand"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "maanden"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "uur"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "week"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "weken"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "uur"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "maand"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuut"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "maanden"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "seconden"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "jaar"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "jaren"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Je bent vergeten een datum te kiezen."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Je hebt een ongeldige datum gekozen."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"de tijd die het is op het moment dat de filter gestart\n"
-"wordt, of een vfolder wordt geopend."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"de tijd die u hier invoert."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"een tijd relatief aan het moment dat de filter wordt gestart;\n"
-"\"een week geleden\", bijvoorbeeld."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "de huidige tijd"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "Een tijd die u specificeert"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "Een tijd relatief aan de huidige tijd"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Selecteer een tijd om mee te vergelijken"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Vergelijk met"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klik hier om een datum te selecteren>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " geleden"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "geleden"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " geleden"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<klik hier om een datum te selecteren>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Selecteer een tijd om mee te vergelijken"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregels"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Geef Bestandsnaam:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' bestaat niet of is geen normaal bestand"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Kies een actie:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Dan"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Actie Toevoegen"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10482,12 +10631,12 @@ msgstr ""
 "U bent vergeten een map te kiezen.\n"
 "Ga terug en kies een geldige map om berichten in op te slaan"
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10496,92 +10645,168 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Belangrijk"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "na"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "U moet deze filter een naam geven."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Regel naam: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Geen Titel"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "inkomend"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "uitgaand"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Vergelijk met"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Filters Bewerken"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Inkomend"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Uitgaand"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"de tijd die u hier invoert."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"een tijd relatief aan het moment dat de filter wordt gestart;\n"
+"\"een week geleden\", bijvoorbeeld."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"de tijd die u hier invoert."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "Een tijd relatief aan de huidige tijd"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "geleden"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "alleen specifieke mappen"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "de huidige tijd"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "Een tijd die u specificeert"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "VMap-bronnen"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "met alle actieve niet-lokale mappen"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "met alle lokale en actieve niet-lokale mappen"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "met alle lokale folders"
 
@@ -10609,42 +10834,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Bedrijf"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ontvangstdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Verzendingsdatum"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "eindigt niet op"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "bestaat niet"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bestaat niet"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "klinkt niet als"
@@ -10666,89 +10891,85 @@ msgid "ends with"
 msgstr "eindigt op"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Shellopdracht uitvoeren"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Bestaat"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Antwoord"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Belangrijk"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "is"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "is na"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "is voor"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "is Gemarkeerd"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "is groter dan"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "is niet"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "Is niet Gemarkeerd"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Mailinglijst"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Berichtinhoud"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Berichtkop"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Shellopdracht uitvoeren"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Speel een geluid af:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Gelezen"
 
@@ -10764,57 +10985,87 @@ msgstr "Overeenkomende Regex"
 msgid "Replied to"
 msgstr "Beantwoord aan"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "is groter dan"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "is kleiner dan"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Score"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Afzender"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Stel Status in"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Shellopdracht uitvoeren"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Grootte (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "klinkt als"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Source-Account"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifieke kop"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "begint met"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Stel Status in"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regel"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Regel Toevoegen"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Regel bewerken"
 
@@ -10822,11 +11073,11 @@ msgstr "Regel bewerken"
 msgid "Score Rules"
 msgstr "Bewerk Scoreregel"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "U moet deze vfolder een naam geven."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "U moet minstens ��n map als bron opgeven."
 
@@ -10834,31 +11085,31 @@ msgstr "U moet minstens ��n map als bron opgeven."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importeren..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importeren %s als %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Bezig met doorzoeken %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Post"
 
@@ -10919,39 +11170,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importeert uw oude Netscape informatie"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokaal postbusbestand %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Map wordt gescant"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Importeren wordt gestart"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Instellingen:"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filters Bewerken"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11032,12 +11283,12 @@ msgstr "Fabriek voor het post-samenvattingscomponent."
 msgid "Font Preferences"
 msgstr "Samenvatting Instellingen"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Accounts"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11085,7 +11336,7 @@ msgstr "Eigenschappen..."
 msgid "Change this folder's properties"
 msgstr "Verander de eigenschappen van deze map"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11093,58 +11344,78 @@ msgstr ""
 "Sommige van uw email-instellingen lijken ongeldig, controleer alstublieft of "
 "alles goed staat."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Er is geen post-transportmethode ingesteld"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Waarschuwing: Veranderd Bericht"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Stel een nieuw bericht op"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Volgend Bericht"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Vorig Bericht"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nieuw Bericht"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan de Mail-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan de mailconfiguratie-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan de Map-info-component van Evolution niet initialiseren."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Verbinden met server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenschappen voor \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
@@ -11194,136 +11465,136 @@ msgstr "%d totaal"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Maak VMap Van Bericht"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filter op Afzen_der"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Afdrukken"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Afzender beantwoorden"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Lijst Be_antwoorden"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Antwoord..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Markeer als Voltooid"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Markering Wissen"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_keer als Gelezen"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markeer als O_ngelezen"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Markeer als _Belangrijk"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markeer Als _Onbelangrijk"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopi�ren naar Map..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan Adresboek Toevoegen"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creeer Regel Van Bericht"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VMap op Mailinglijst"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter op Mailinglijst (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VMap op Mailinglijst (%s)"
@@ -11388,76 +11659,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution Nieuwsbeheer"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Gebruikersnaam:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u deze account wilt verwijderen?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Niet verwijderen"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Daadwerkelijk dit account verwijderen?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Uitzetten."
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aangezet"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Accountnaam:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11467,30 +11729,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailinglijst"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11502,7 +11764,7 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11514,7 +11776,7 @@ msgstr ""
 "of ontvangen.\n"
 "Wilt u email nu configureren?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11522,7 +11784,7 @@ msgstr ""
 "U dient een identiteit te configuren\n"
 "voordat u post kunt versturen."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11531,7 +11793,7 @@ msgstr ""
 "voordat u email kunt versturen."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11539,11 +11801,11 @@ msgstr ""
 "U verstuurt een HTML-geformateerd bericht, maar de volgende ontvangers "
 "willen geen HTML emailtjes ontvangen:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Toch versturen?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11551,7 +11813,7 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11559,11 +11821,11 @@ msgstr ""
 "Omdat de contactenlijst waar u heen stuurt configureerd is voor verborgen "
 "adreslijsten zal dit bericht slechts Bcc dressen bevatten."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Dit bericht bevat alleen Bcc-ontvangers."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11573,16 +11835,12 @@ msgstr ""
 "toevoegen van een 'Apparently-To' kop.\n"
 "Toch versturen?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "U moet een account configureren voordat u deze email kunt versturen."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11590,28 +11848,28 @@ msgstr ""
 "Kan de drafts map voor die account niet openen.\n"
 "Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M schreef %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopieer bericht(en) naar"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Weet u zeker dat u alle %d berichten wilt bewerken?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11619,7 +11877,7 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11627,32 +11885,32 @@ msgstr ""
 "U kunt alleen berichten bewerken die opgeslagen zijn\n"
 "in de Kladmap."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Geen bericht geselecteerd"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Volgende map met ongelezen berichten tonen?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11660,7 +11918,7 @@ msgstr ""
 "Er zijn geen nieuwe berichten meer in deze map.\n"
 "Wil je naar de volgende map gaan?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11672,7 +11930,7 @@ msgstr ""
 "\n"
 "De berichten echt verwijderen?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11681,28 +11939,28 @@ msgstr ""
 "Fout bij het laden van filterinformatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11724,7 +11982,7 @@ msgstr "_Beveiliging"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Ander contact"
@@ -11745,20 +12003,21 @@ msgid "Add Signature"
 msgstr "Bewaar handtekening"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Voer uw naam en emailadres in. De \"optionele\" velden behoeven niet te "
 "worden ingevuld, tenzij u wilt dat deze informatie wordt meegezonden bij "
 "emailberichten die u verzendt."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Voer de informatie over de inkomende mailserver in. Als u niet weet wat voor "
 "server u gebruikt, neem dan contact op met uw systembeheerder of met uw "
@@ -11769,24 +12028,23 @@ msgid "Please select among the following options"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Voer de informatie in over de wijze waarop email wordt verzonden. Als u niet "
 "weet wat u gebruikt, neem dan contact op met uw systembeheerder of met uw "
 "Provider."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "U bent bijna klaar met het instellen van uw emailconfiguratie. De "
 "identiteit, inkomende emailserver en uitgaande email verzendmethode die u "
@@ -11795,44 +12053,20 @@ msgstr ""
 "naam zal alleen worden gebruikt als roepnaam."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution Account Assistent"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "na"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Account"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Verbinden met server..."
 
@@ -12097,238 +12331,226 @@ msgstr "Opslaan en Sluiten"
 msgid "Loading Images"
 msgstr "Toon _Afbeeldingen"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Postconfiguratie"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Mailbox locatie"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Berichten"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Berichtweergave"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micronesi�"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Server"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Nieuwe Mail Notificatie"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Nieuwsbronnen"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Optionele Informatie"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organisatie:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG sleutel ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Waarschuw wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Druk geselecteerde contacten af"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan bericht niet opnemen"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Geciteerd"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Antwoordadres:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Email Ontvangen"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Ontvangst Instellingen"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Onthoud dit wachtwoord"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Vereiste informatie"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr " (standaard)"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Beveiliging"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Beveiligde MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecteer het pad naar PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Email Versturen"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Verzonden _berichtenmap:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Verzonden en Klad Berichten"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server _vereist aanmelding"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverconfiguratie"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server _Type: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snelkoppelingen"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Bewaar handtekening"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Bron"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Bron Informatie"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Geef Bestandsnaam:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standaard Unix mailboxbestand"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12338,208 +12560,204 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Oost"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Bestand met ondertekening:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Altijd afbeeldingen ophalen va het internet"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Onderteken uitgaande berichten altijd bij het gebruik van dit account"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Aanmeldings Type:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Aanmeldings type:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatisch controleren op nieuwe post"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Piep bij binnenkomst van nieuwe email"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certificaat-ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bevestigen bij het Legen van een map"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Bestand met _HTML-ondertekening:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standaard"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Geen melding bij binnenkomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Aanzetten"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Volledige Naam:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "In HTML-berichten"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "Toon afbeeldingen als de afzender in het adresboek voorkomt"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Stel dit in als standaardaccount"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markeer berichten als Gelezen na "
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nooit afbeeldingen van het internet ophalen"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_Pad naar het PGP-programma:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Geluid afspelen bij binnekomst van nieuwe berichten"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Waarschuw wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Waarschuw wanneer een bericht verstuurd wordt zonder _onderwerp"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Berichten Ophalen"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Standaardwijze van doorsturen: "
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (standaard)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Beveiliging"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Berichten versturen"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Toon Tijd Als"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Bestand met ondertekening:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Gebruik een beveiligde verbinding (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_elke"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " kleur"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "niewswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12563,203 +12781,213 @@ msgstr "Kon geen S/MIME envelope context maken"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kon geen S/MIME decode context maken"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kon tijdelijke bestand '%s' niet maken: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Opslaan op Schijf..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Bijlage Opslaan"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Toon _Afbeeldingen"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Bezig met laden berichtinhoud"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Verlopen taken:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Open Link in Browser"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopieer Link Locatie"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Sla Link op als (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Sla Figuur op als..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijlage"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kon MIME bericht niet verwerken. Laat zien als source"
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ongeldig Emailadres"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Van"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Post"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Bericht Opslaan Als..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Dit bericht is digitaal ondertekend. Klik op het hangslot icoontje voor meer "
 "informatie."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kon geen PGP verificatie context maken"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Dit bericht is digitaal ondertekend en is authentiek."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond dat "
 "het authentiek is."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte"
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale Mappen"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Map opnieuw configureren"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Kan map-metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan map-matainfo niet opslaan in %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan map-metagegevens %s niet verwijderen: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s mag niet opnieuw geconfigureerd worden omdat het geen lokale map is"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12767,16 +12995,16 @@ msgstr ""
 "Als deze map niet meer kan worden geopend, dan is\n"
 "het wellicht noodzakelijk om deze handmatig te repareren."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "U kunt het formaat van een niet-lokale map niet veranderen."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Herconfigureer /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12785,7 +13013,7 @@ msgstr ""
 "Fout tijdens '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12794,7 +13022,7 @@ msgstr ""
 "Fout tijden het uitvoeren van bewerking:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Bezig"
 
@@ -12802,100 +13030,100 @@ msgstr "Bezig"
 msgid "Filtering Folder"
 msgstr "Map wordt Gefilterd"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Maar het bericht is wel succesvol verzonden."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bezig met verzenden bericht %d van %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "faalde op bericht %d van %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Bezig met opslaan bericht in map"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Bezig met verplaatsen van berichten naar %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Bezig met het kopi�ren van berichten naar %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Map wordt ververest"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Bezig met ophalen van %d bericht(en)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Bezig met het opslaan van %d bericht(en)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12904,7 +13132,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12913,11 +13141,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12926,27 +13154,22 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Shellopdracht wordt uitgevoerd: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Zoeken"
 
@@ -13001,32 +13224,41 @@ msgstr "Pas: %s, Type: %s"
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Email Versturen & Ontvangen"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Alles Annuleren"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Aan het Actualiseren ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Onthoud dit wachtwoord"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Onthoud dit wachtwoord tot het einde van deze sessie"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
@@ -13053,7 +13285,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Naam:"
 
@@ -13083,7 +13315,7 @@ msgstr "Doorgestuurd bericht - %s"
 msgid "Forwarded message"
 msgstr "Doorgestuurd bericht"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Doorgestuurd Bericht"
 
@@ -13097,7 +13329,7 @@ msgstr "Bezig met aanmaken vfolder: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13110,95 +13342,98 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 "Poging tot aanpassen van vMap '%s' gedetecteerd terwijl deze niet bestaat."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(geen onderwerp)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Bericht"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -13231,48 +13466,48 @@ msgstr "Ontvangen"
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Doorsturen"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Antwoord"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Bron Informatie"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Voorbeeld"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Antwoord"
@@ -13297,16 +13532,16 @@ msgstr "Bezig met aanmelden bij map \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Bezig met afmelden van map \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Map"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
@@ -17769,11 +18004,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Vliegveld"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23189,8 +23426,8 @@ msgstr "Geen omschrijving"
 msgid "Mail summary"
 msgstr "Samenvatting Post"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokale Mappen"
 
@@ -23213,15 +23450,15 @@ msgstr "EHAM:EHEH:EHGG:EHLW:EHBK:EHRD:EHSB:EBAW:EBBR:EBLG:EBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Woord van de Dag"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Quotes van de Dag"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Voeg een nieuwsbron toe"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Geef the URL van de nieuwsbron die u wilt toevoegen"
 
@@ -23233,27 +23470,27 @@ msgstr "Fout bij downloaden van RDF"
 msgid "News Feed"
 msgstr "Nieuws Bron"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Toevoegen"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneeuwval"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Geen taken"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Geen Omschrijving)"
 
@@ -24525,7 +24762,8 @@ msgid "Tasks "
 msgstr "Taken"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Weerinstellingen"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24582,7 +24820,7 @@ msgstr "Details weergeven"
 msgid "Cancel Operation"
 msgstr "Bewerking Annuleren"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24596,20 +24834,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Als Verzonden Map"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Klad"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Outbox"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Verzonden"
 
@@ -24849,22 +25087,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Nieuwe map maken"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Het type van de geselecteerde map is niet geldig\n"
-"voor de opdracht."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "_Nieuwe map aanmaken..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nieuw..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
@@ -24886,7 +25117,7 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
@@ -24917,21 +25148,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution Fout"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "U mag alleen importeren naar lokale mappen"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24940,11 +25167,11 @@ msgstr ""
 "Er is geen importeerfunctie die het volgende kan afhandelen\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Bezig met importeren"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24953,17 +25180,17 @@ msgstr ""
 "Importeren %s.\n"
 "Beginnen %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Fout bij laden %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24972,31 +25199,31 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Bestandstype:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importeer informatie en instellingen van oudere programma's"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importeer een enkel bestand"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25004,24 +25231,24 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Selecteer Map"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Selecteer een doelmap voor deze belangrijke data"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importeer"
 
@@ -25069,9 +25296,14 @@ msgstr "Bezig met openen map %s"
 msgid "in \"%s\" ..."
 msgstr "Openen in %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kon de naam van de map niet wijzigen: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kan de gespecificeerde map niet aanmaken:\n"
 "%s"
@@ -25089,8 +25321,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kon de Evolution Mailer-assistent interface niet initialiseren\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nieuw"
@@ -25131,57 +25363,58 @@ msgstr "Ga naar map..."
 msgid "Select the folder that you want to open"
 msgstr "Selecteer de map die je wilt openen"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Maak een nieuwe snelkoppeling"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecteer de map waar de snelkoppeling naar moet wijzen:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Werk Offline"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Geen)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken"
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in bezig offline te gaan."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution is nu offline. Klik op deze knop on online te gaan werken."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25193,12 +25426,12 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25210,31 +25443,31 @@ msgstr ""
 "gestopt. U zult Evolution opnieuw moeten starten om die informatie\n"
 "weer te kunnen benaderen."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Generieke fout"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Nieuwe snelkoppelingsgroep aanmaken"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Groep:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25243,107 +25476,117 @@ msgstr ""
 "Wil u echt de groep `%s' verwijderen\n"
 "van de snelkoppelingsbalk?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Niet verwijderen"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Hernoem Snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Hernoem deze snelkoppelingsgroep naar:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Kleine Pictogrammen"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Toont de snelkoppelingen als kleine pictogrammen"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Grote Pictogrammen"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Toont de snelkoppelingen als grote pictogrammen"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nieuwe Groep..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Deze Groep _Verwijderen..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Verwijder deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Deze Groep _Hernoemen..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Hernoem deze snelkoppelingsgroep"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Verberg de Snelkoppelingsbalk"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Verberg de snelkoppelingenbalk"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Maak een nieuwe snelkoppeling"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Maak een nieuwe snelkoppeling"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Hernoem snelkoppeling"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Hernoem deze snelkoppeling naar:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Open deze map waar deze snelkoppeling naar wijst"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Open in Nieuw Venster"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Open de map waar deze snelkoppeling naar wijst in een nieuw venster"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Hernoem deze snelkoppeling"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Verwijderen"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Snelkoppelingen"
 
@@ -25352,55 +25595,55 @@ msgstr "Snelkoppelingen"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Geen fout"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat reeds"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde foldertype is niet geldig"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O fout"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "De map is niet leeg"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder is niet gevonden"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Functie niet ge�mplementeerd voor deze opslag"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "De opgegeven folder kan niet worden veranderd of verwijderd"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan de map niet verplaatsen naar een van zijn eigen kinderen"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Kan geen map met die naam maken"
 
@@ -25455,63 +25698,63 @@ msgstr ""
 "De fout van het activeringssysteem is:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA fout"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Onderbroken"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ongeldige argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Heeft al een eigenaar"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Geen eigenaar"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Niet gevonden"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Niet ondersteund type"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Niet ondersteund schema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Niet ondersteunde bewerking"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Bestaat"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ongeldige URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Heeft submappen"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Geen ruimte over"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Oude eigenaar is gestorven"
 
@@ -25535,6 +25778,26 @@ msgstr "Computernaam"
 msgid "The following connections are currently active:"
 msgstr "De volgende verbindingen zijn op 't moment actief:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacten: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Post"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Taken"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mapnaam:"
@@ -25547,6 +25810,34 @@ msgstr "Maptype:"
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "_Nieuwe map aanmaken..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Mapnaam:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Servernaam:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Gebruikersnaam:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Instellingen Assistent"
@@ -25645,15 +25936,15 @@ msgstr "Dit bericht niet meer weergeven."
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution is bezig met afsluiten ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25673,44 +25964,44 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Dit bericht niet meer weergeven."
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Splash screen niet tonen"
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr "Beginnen in offline modus"
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25719,7 +26010,7 @@ msgstr ""
 "%s: --online en --oflinne kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo-componentensysteem niet initializeren"
 
@@ -25754,113 +26045,107 @@ msgstr "Kopieer de selectie"
 msgid "Copy to Folder..."
 msgstr "Kopi�ren naar Map..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Nieuw contact maken"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Maak een nieuwe contactenlijst"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Verwijder geselecteerde contacten"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Verplaats Contact(en) naar een Andere Map..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Verplaatsen naar Map..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Geeft een voorbeeld van de af te drukken contacten"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Afdruk_voorbeeld"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Druk geselecteerde contacten af"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Bewaar de geselecteerde contacten als een VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Selecteer alle contacten"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Stuur een bericht naar de geselecteerde contacten."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Stuur bericht aan contact..."
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Stuur de geselecteerde contacten naar iemand anders."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Huidige contact weergeven"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Contacten Lijst"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Contacten _Doorsturen..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Op_slaan als VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Zoek naar Contacten"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Alles _Selecteren"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Stuur Bericht aan Contact..."
 
@@ -25904,11 +26189,6 @@ msgstr "Maand"
 msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de kalender"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Afdruk_voorbeeld"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Druk deze Kalender af"
@@ -25941,7 +26221,7 @@ msgstr "Week"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Sluiten"
 
@@ -25954,7 +26234,7 @@ msgid "Delete this item"
 msgstr "Verwijder dit item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hoofdgereedschapsbalk"
 
@@ -25966,8 +26246,8 @@ msgstr "Geef een afdrukvoorbeeld van het item"
 msgid "Print this item"
 msgstr "Item afdrukken"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Opslaan"
 
@@ -25992,9 +26272,9 @@ msgstr "Bewaar dit item op de harde schijf"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Bestand"
 
@@ -26004,7 +26284,7 @@ msgstr "En_velop Afdrukken..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
@@ -26018,8 +26298,8 @@ msgstr "Stuur _Bericht aan Contact..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Opslaan"
 
@@ -26116,26 +26396,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Verwijder alle verwijderde berichten permanent uit alle mappen"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Volgend Bericht"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Bezig met opslaan bericht in map"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Toon berichtenvoorbeeld-venster"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abboneer of zegt abbo op op de mappen op de server"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Virtuele-Mapbewerker..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filters..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Voorbeeld Venster"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Abonneren op Mappen..."
 
@@ -26235,7 +26525,7 @@ msgstr "Toon Discussiebomen"
 msgid "_Expunge"
 msgstr "_Wissen"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Map"
 
@@ -26491,177 +26781,192 @@ msgstr "Vorige Ongelezen Bericht"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Taak Antwoord"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Controleer op nieuwe berichten in alle mappen"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Vorige Belangrijke Bericht"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Geeft een afdrukvoorbeeld van het bericht"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Vorige"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Druk dit bericht af"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Doorsturen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Stuur het geselecteerde bericht door naar iemand"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "De tekst zijn originele grootte geven"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Zoek b_ericht..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Kleiner"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Sla bericht op als tekstbestand"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Zoek voor tekst in de body van het weergegeven bericht"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Stel de pagina instellingen in voor de huidige printer"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Toon broncode van _Bericht"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Toon alle _Koppen"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Laat berichten in normale stijl zien"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Laat berichten zien met alle email headers"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Laat de ruwe emailbron van het bericht zien"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Tekstgroo_tte"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Maak verwijderen ongedaan van de geselecteerde berichten"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VMap op Mailinglijst"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VMap op Afze_nder"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VMap op Geadresseerden"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VMap op Onderwerp"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Bijgevoegd"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Kopieer naar Map"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Maak Filter Van Bericht"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Bericht Doorsturen"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Ga naar"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Ingebonden"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Groter"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Berichtweergave"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Verplaats naar Map"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Volgend Bericht"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normale Weergave"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Open Bericht"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Vorig Bericht"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "He_rnoemen..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Gereedschap"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Sluiten"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "Weerga_ve"
 
@@ -26689,169 +26994,161 @@ msgstr "Encodeer dit bericht met uw S/MIME Encryptie Certificaat"
 msgid "For_mat"
 msgstr "Op_maak"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "_Tekstbestand..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Voeg een bestand bij het bericht"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Tekstbestand invoegen..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Openen"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Bestand openen"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Versleutelen met PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Signeren met PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Versleutelen met S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME Ondertekening"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Opslaan Als"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Kla_d Opslaan"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Sla het huidige bestand op onder een andere naam"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Versturen"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "_Later Versturen"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "_Later versturen"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Stuur het bericht in HTML-formaat"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Dit bericht later versturen"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Dit bericht nu versturen"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Toon/Verberg Bijlages"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Toon _Bijlages"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Toon Bijlages"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signeer dit bericht met uw PGP-sleutel"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signeer dit bericht met uw S/MIME-Ondertekenings Certificaat"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Schakel BCC-weergave aan/uit"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Schakel CC-weergave aan/uit"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Schakel de Afzenderkiezer-weergave aan/uit"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Schakel Antwoordadres-weergave aan/uit"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Bijlage..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc-veld"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc-veld"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "Verwijder Alles"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Van-veld"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Openen..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Antwoordadres-veld:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Bewaar dit item en sluit het dialoogvenster"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Help"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Bewaar handtekening"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Neem abonnement op deze map"
@@ -26947,171 +27244,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Voeg toe aan Snelkoppelingsbalk"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Verander de naam van deze map"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopieer deze map"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Creeer een verbinding naar deze map op de snelkoppelingsbalk"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Maak een nieuwe map aan"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Maak een nieuwe snelkoppeling"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Maak een nieuwe map aan"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Verwijder deze map"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Toon een andere map"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Afsluiten"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution Venster"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importeer gegevens van andere programma's"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Verplaats deze map naar een andere plaats"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "_Nieuwe map aanmaken..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Open in Nieuw Venster"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Open deze map in een nieuw venster"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot Instellingen..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Postconfiguratie"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Verander"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mappenbalk"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Schakel offline werken aan of uit"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Toon de geselecteerde map"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Over Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "Kopi�ren..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Mappenbalk"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Map"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importeer..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "Verplaatsen..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nieuwe Map"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot Instellingen..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Samenvatting Instellingen"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Versturen en Ontvangen"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Snelkoppeling"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Snelkoppelingsbalk"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Snelkoppeling"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Samenvatting Afdrukken"
@@ -27125,17 +27453,40 @@ msgid "Reload the view"
 msgstr "Weegave Herladen"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adreskaarten"
+#, fuzzy
+msgid "By _Company"
+msgstr "Bij Bedrijf"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Bij Bedrijf"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adreskaarten"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefoontypes"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Week Weergave"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dag Weergave"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Maand Weergave"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Werkweek Weergave"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Als Verzonden Map"
@@ -27160,13 +27511,19 @@ msgstr "Op Onderwerp"
 msgid "Messages"
 msgstr "Berichten"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Op Categorie:"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Taak"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "GMT"
 
@@ -27318,11 +27675,11 @@ msgstr "Karakterencodering"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Zoekopdracht-editor"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Bewaar Zoekopdracht"
 
@@ -27362,21 +27719,21 @@ msgstr "Bericht"
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Zoek Nu"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Wissen"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Zoek Nu"
 
@@ -27390,18 +27747,175 @@ msgstr "De Persoonlijke Adresboekserver"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "De Persoonlijke Kalenderserver; kalender fabriek"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kon Gnome-VFS niet initializeren"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kon Gnome niet initializeren"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kon Bonobo niet initializeren"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution kan het lokale adresboek niet benaderen.\n"
+#~ "Dit kan veroorzaakt zijn door het crashen van de adresboek component.\n"
+#~ "Om ons te helpen dit probleem te begrijpen en op te lossen zou u\n"
+#~ "een engelstalige email kunnen sturen aan Jon Trowbridge <trow@ximian."
+#~ "com>\n"
+#~ "met een gedetailleerde beschrijving van de omstandigheden waaronder\n"
+#~ "deze fout zich voordeed. Heel erg bedankt."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution kan het lokale adresboek niet benaderen.\n"
+#~ "Dit mag nooit gebeuren onder normale omstandigheden.\n"
+#~ "U zult waarschijnlijk Evolution moeten sluiten en weer starten\n"
+#~ "om het probleem te verhelpen."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "Verplaatsen..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr ""
+#~ "De status van de bijeenkomst is veranderd. Een geactualiseerde versie "
+#~ "versturen?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Verwijder deze Afspraak"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Issuer: %s\n"
+#~ "Onderwerp: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL Protocol fout"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O Fout: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "'Welkom respons'-fout: %s: waarschijnlijk niet-fataal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Time-out tijdens HELO verzoek: %s: niet-fataal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "'HELO respons'- fout: %s: niet-fataal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Time-out tijdens QUIT-verzoek: %s: niet-fataal"
+
+#~ msgid "Insert File"
+#~ msgstr "Bestand Invoegen"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Je hebt een ongeldige datum gekozen."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "De datum van het bericht zal vergeleken worden met\n"
+#~ "de tijd die het is op het moment dat de filter gestart\n"
+#~ "wordt, of een vfolder wordt geopend."
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Bedrijf"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution Nieuwsbeheer"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Weet u zeker dat u dit nieuws-account wilt verwijderen?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "U moet een account configureren voordat u deze email kunt versturen."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Server"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Nieuwsbronnen"
+
+#~ msgid "Source"
+#~ msgstr "Bron"
+
+#~ msgid "Source Information"
+#~ msgstr "Bron Informatie"
+
+#~ msgid "newswindow1"
+#~ msgstr "niewswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Opslaan op Schijf..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Bericht Opslaan Als..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Shellopdracht wordt uitgevoerd: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Nieuwe map maken"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Het type van de geselecteerde map is niet geldig\n"
+#~ "voor de opdracht."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "U mag alleen importeren naar lokale mappen"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Contacten Lijst"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "_Tekstbestand..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Voeg een bestand bij het bericht"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Tekstbestand invoegen..."
+
+#~ msgid "Send _Later"
+#~ msgstr "_Later Versturen"
+
+#~ msgid "Send _later"
+#~ msgstr "_Later versturen"
+
+#~ msgid "Send the message later"
+#~ msgstr "Dit bericht later versturen"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot Instellingen..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adresboekbronnen"
@@ -27572,10 +28086,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Handtekeningbestand:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Verwijder alles behalve de  handtekening"
 
@@ -28002,9 +28512,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "_Organization:"
 #~ msgstr "Organisatie:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Onthoud dit wachtwoord"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Stuur berichten standaard in HTML-formaat."
 
@@ -28289,12 +28796,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Name contains"
 #~ msgstr "Naam bevat"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Maak een nieuwe afspraak"
-
-#~ msgid "Create a new task"
-#~ msgstr "Nieuwe taak aanmaken"
-
 #, fuzzy
 #~ msgid "New _Task"
 #~ msgstr "Nieuwe Taak"
@@ -28343,10 +28844,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ "4-aanmelding."
 
 #, fuzzy
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Kon niet verbinden met POP-server op %s."
-
-#, fuzzy
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Kon niet verbinden met POP-server op %s."
 
@@ -28385,9 +28882,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Berichten opslagmap (intern)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Kon niet verbinden met de opslag: %s"
-
 #, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "Nieuw Bericht"
@@ -28488,10 +28982,6 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Creeer of bewerk een emailaccount of andere voorkeuren"
 
-#, fuzzy
-#~ msgid "New Message"
-#~ msgstr "Volgend Bericht"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "Postinstellingen..."
 
@@ -28531,8 +29021,5 @@ msgstr "init_bonobo(): kon Bonobo niet initializeren"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Maak Een Nieuwe _Bijeenkomst"
 
-#~ msgid "Create a new meeting request"
-#~ msgstr "Maak een nieuw bijeenkomstverzoek"
-
 #~ msgid "_Meeting..."
 #~ msgstr "Vergadering..."
diff --git a/po/nn.po b/po/nn.po
index e9d020ef34..338e1d704f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-1.01\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-01-30 06:10+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
 "Language-Team: \n"
@@ -34,7 +34,7 @@ msgstr "Importerar VCard-filer inn i Evolution."
 msgid "File As"
 msgstr "Arkiver som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
@@ -342,46 +342,46 @@ msgstr "VKort for %s"
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initialisere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "S�kjer ..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Lastar ..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Legg til kort til LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Fjernar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Endrar kort fr� LDAP-tenar ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Startar s�k om att."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Mottek LDAP-s�keresultat ..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Klarter ikkje � tolke URL fr� �%s�"
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -493,23 +493,32 @@ msgstr "LDAP-tenar"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tenar som inneheld kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Opprett ny kontak"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "&Innhald ..."
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Lagar eit nytt dokument"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -531,27 +540,27 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "Les filinformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Den oppgitte fila finst ikkje"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Klarte ikkje � initialisere gnome-vfs"
 
@@ -559,18 +568,18 @@ msgstr "Klarte ikkje � initialisere gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Ikkje i stand � opne adresseboka"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -578,50 +587,50 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Oppgi passord for %s (brukar %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "sluttar med"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "E-post 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avansert ..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Nokon kategori"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -743,7 +752,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Addressebokkjelder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -841,8 +850,8 @@ msgstr "Oppsett"
 msgid "Mappings"
 msgstr "Margar"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_kvar"
@@ -896,8 +905,8 @@ msgstr "S�kes_kop:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "S�ker"
 
@@ -1088,15 +1097,15 @@ msgid "Using email address"
 msgstr "E-postadresse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -1142,12 +1151,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "R_edig�r"
@@ -1264,10 +1273,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1296,33 +1305,15 @@ msgstr "(%d ikkje vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Avsendar inneheld"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Vel namn"
@@ -1344,15 +1335,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Flytt ..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Mapper:"
 
@@ -1455,11 +1441,12 @@ msgstr "Vil motta _HTML-post"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -2698,7 +2685,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -2760,7 +2747,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Avansert s�k"
 
@@ -2790,21 +2777,21 @@ msgstr ""
 "%1"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Vellukka"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -2813,8 +2800,8 @@ msgstr "Ukjend feil"
 msgid "Repository offline"
 msgstr "depot i vcs"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
@@ -2831,7 +2818,7 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikkje st�tta"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2854,48 +2841,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Fila %s finst ikkje"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Anna feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Feil ved tilleggjing av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Vis"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2903,22 +2895,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Ingen kort"
@@ -2991,7 +2983,7 @@ msgstr "Adressebok"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VKort"
 
@@ -3031,7 +3023,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilot-innstillingar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
@@ -3040,8 +3032,8 @@ msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -3061,7 +3053,7 @@ msgid "Move to folder..."
 msgstr "Flytt til _mappe ..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
@@ -3072,20 +3064,20 @@ msgid "Copy"
 msgstr "Kopier"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slett"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktiv visning"
@@ -3242,7 +3234,7 @@ msgstr "Margar"
 msgid "Number of columns:"
 msgstr "Tal p� kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Val"
 
@@ -3332,26 +3324,26 @@ msgstr "Avtale utan namn"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "H�g"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Udefinert"
@@ -3482,11 +3474,11 @@ msgstr "L�g grense (minutt):"
 msgid "_Edit appointment"
 msgstr "R_edig�r avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3494,13 +3486,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "�tvaring"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3511,7 +3503,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Ikkje sp�r igjen"
@@ -3549,7 +3541,7 @@ msgstr "Skildring inneheld"
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
@@ -3561,7 +3553,7 @@ msgstr "%1 bit %2 %3"
 #. 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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d. %a %b"
 
@@ -3583,17 +3575,17 @@ msgstr "%d. %B %Y"
 msgid "%d %B"
 msgstr "%d. %b"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -3618,37 +3610,37 @@ msgstr "E"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Oppteke"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikkje starta"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3656,56 +3648,55 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Repeterande"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nei"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dagsvisning"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Arbeidsvekevisning"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vekesvisning"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "M�nadsvising"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3713,12 +3704,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mappe inneheld avtaler og hendingar"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Oppg�ver"
 
@@ -3726,44 +3717,62 @@ msgstr "Oppg�ver"
 msgid "Folder containing to-do items"
 msgstr "Mappe inneheld huskeliste"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Avtale"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Lag ein ny avtale"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Nettverksinnstillingar"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "M�te"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Opprett ei ny oppg�ve"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Oppg�ve"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Opprett ei ny oppg�ve"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Avtale"
+msgid "Create a new all-day appointment"
+msgstr "Lag ein ny avtale"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3835,7 +3844,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dagar"
 
@@ -3844,11 +3854,13 @@ msgstr "dagar"
 msgid "extra times every"
 msgstr "Oppdater kvart"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "timar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutt"
 
@@ -3976,7 +3988,7 @@ msgstr "P�minning"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -4005,7 +4017,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -4184,7 +4196,7 @@ msgid "_Fri"
 msgstr "_Fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Generelt"
 
@@ -4230,21 +4242,35 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker p� at du vil sletta denne metoden?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
@@ -4318,61 +4344,61 @@ msgstr " (Ferdig"
 msgid "Due "
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redig�r avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Oppg�ve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppf�ring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Ikkje stand til � f� tak i noverande versjon!"
 
@@ -4575,7 +4601,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4587,7 +4613,7 @@ msgstr "Rolle"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4673,7 +4699,7 @@ msgstr "p�"
 msgid "first"
 msgstr "liste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
@@ -4697,7 +4723,7 @@ msgstr "liste"
 msgid "Other Date"
 msgstr "Alternativ faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
@@ -4802,20 +4828,27 @@ msgstr "prosent ferdig"
 msgid "Date Completed:"
 msgstr "Dato ferdig"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "Vel ikon"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Framgang"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -4829,7 +4862,7 @@ msgstr "Enkel"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4898,80 +4931,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Opne"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Lagre som ..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Tildel oppg�ve"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Fort framover"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk oppg�ver som ferdig"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppg�ver"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Trykk her for � leggje til ei oppg�ve"
@@ -4980,8 +5013,8 @@ msgstr "Trykk her for � leggje til ei oppg�ve"
 msgid "Alarms"
 msgstr "Alarmar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Ferdig"
 
@@ -5009,11 +5042,9 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Start-dato"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Samandrag"
 
@@ -5055,114 +5086,113 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "M�te"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Ny oppg�ve"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut ..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til idag"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_G� til dato ..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Set opp %1"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Set opp %1"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Lagre som ..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "K�yreplan ..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Fort framover"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Erstatt denne f�rekomsten?"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -5209,7 +5239,7 @@ msgstr "Ferdig"
 msgid "Task Due: <b>"
 msgstr "Oppg�va ferdig: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Informasjon"
@@ -5220,12 +5250,12 @@ msgstr "Informasjon"
 msgid "iCalendar Error"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5233,335 +5263,340 @@ msgstr ""
 "<br> Sj� gjennom den f�lgjande informasjon, og velj ei handling fr� menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Plassering:"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Avsl�tt"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Mellombels"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Avsl�"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Opdat�r status p� svar"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informasjon"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sp�r etter deg for � stille opp p� eit m�te."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "M�teframlegg"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "M�tekansellering"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "&Finn i melding ..."
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "generer avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Oppg�veinformasjon"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Oppg�veframlegg"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �nskjar � leggje til ei eksisterande oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Oppg�veoppdatering"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Dette er ei f�rehandsvising av det valte bakgrunnsbiletet."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Oppg�veoppdateringsforep�rjing"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Oppg�vesvar"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har kansellert ei oppg�ve."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Oppg�vekansellering"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Skriv avlusingsinformasjon"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Pr�v �%s --help� for meir informasjon\n"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Fri/ledig foresp�rsel"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Dette er ei repeterande hending."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Private meldingar"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Meldinga har ingen sendar"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 #, fuzzy
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendarmelding."
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Dato"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vel mappe"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vel mappe"
@@ -5608,7 +5643,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Bil-telefon"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "Tenarinformasjon"
@@ -5623,61 +5658,55 @@ msgid "Non-Participants"
 msgstr "Ikkje-deltakarar"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressurs"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Rom"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Chair"
 msgstr "Teikn"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 #, fuzzy
 msgid "Required Participant"
 msgstr "Tenarinformasjon"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 #, fuzzy
 msgid "Optional Participant"
 msgstr "Personleg informasjon"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "Vel ikon"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Mellombels"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -5771,22 +5800,23 @@ msgstr "&Helsingstekst:"
 msgid "Meeting _end time:"
 msgstr "M�t_e slutttid:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, fuzzy, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr ""
@@ -5794,29 +5824,25 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Fullf�ringsdato"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Forventar %1"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "Slett _denne avtalen"
-
 #: calendar/gui/gnome-cal.c:1522
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
@@ -5830,11 +5856,16 @@ msgstr ""
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden %1 er ikkje st�tta."
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Feil ved opning"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Leitar etter tilleggsmodular"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5891,57 +5922,62 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informasjon om oppg�ve"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Personleg informasjon"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Informasjon"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Frisk opp liste"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Kunne ikkje initialisere Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr ""
@@ -6172,9 +6208,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "F�rehandsvising av utskrift"
 
@@ -6204,8 +6239,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ikkje sp�r igjen"
 
@@ -6261,17 +6296,27 @@ msgstr "Importerar VCard-filer inn i Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerar VCard-filer inn i Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr "Mottek meldingar fr� %1"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "P�minning"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Kalendermelding"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6280,112 +6325,112 @@ msgstr ""
 "Evolution har funne Pine e-postfiler.\n"
 "Vil du importere desse inn i Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalender"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7999,78 +8044,88 @@ msgstr "Lagrar mappe �%s�"
 msgid "You must be working online to complete this operation"
 msgstr "Kan ikkje gjera LIST-operasjon ferdig"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Kan ikkje 'chown' 'spool'-katalogen"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mottek melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Kan ikkje opne melding"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Ugyldig(e) argument"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Ugyldig(e) argument"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -8132,7 +8187,7 @@ msgstr "Flyttar melding"
 msgid "Copying messages"
 msgstr "Melding"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8140,46 +8195,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar fr� POP-tenaren: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "G� til side"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8187,18 +8242,18 @@ msgid ""
 "%.*s"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Kunne ikkje leggja til melding:\n"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Klarte ikkje � dekode melding."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kunne ikkje laga katalog\n"
@@ -8227,22 +8282,22 @@ msgid "Could not lock '%s'"
 msgstr "Kunne ikkje starta %1."
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8310,11 +8365,15 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8435,7 +8494,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8610,31 +8669,134 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje � opprette mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "�tvaring ved &tilbaketrekte sertifikat"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "�tvaring ved &tilbaketrekte sertifikat"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Ugyldig sertifikat fr� %s\n"
-"\n"
-"%s\n"
-"\n"
-"Vil du akseptere likevel?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Signaturfil:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Feil ved asting av %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Ute av kontoret"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "�tvaring ved &tilbaketrekte sertifikat"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ugyldig argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8643,16 +8805,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Ugyldig sertifikat fr� %s\n"
+"\n"
+"%s\n"
+"\n"
+"Vil du akseptere likevel?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8672,32 +8851,39 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje � tolke URL fr� �%s�"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Leitar etter tilleggsmodular"
@@ -8705,12 +8891,12 @@ msgstr "Leitar etter tilleggsmodular"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8739,45 +8925,45 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 #, fuzzy
 msgid "This message is not currently available"
 msgstr "%1 er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -8788,10 +8974,10 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Kunne ikkje leggja til melding:\n"
@@ -8806,7 +8992,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Check for new messages in all folders"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mapper"
 
@@ -8838,7 +9024,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Passord"
 
@@ -8846,71 +9032,75 @@ msgstr "Passord"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilknytning avbroten"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operasjonen vart stoppa"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentisering feila."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mappa er ikkje tom"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentisering:"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8920,25 +9110,33 @@ msgstr ""
 "Ikkje i stand til � autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
@@ -8947,7 +9145,7 @@ msgstr ""
 "%2"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8971,7 +9169,9 @@ msgid "Local delivery"
 msgstr "Mapper"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9000,12 +9200,12 @@ msgstr "Standardfil"
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9016,25 +9216,25 @@ msgstr ""
 msgid "Store root %s is not a regular directory"
 msgstr "er ei vanleg fil"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, fuzzy, c-format
 msgid "Local mail file %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
@@ -9042,12 +9242,12 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
@@ -9055,7 +9255,7 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -9116,7 +9316,7 @@ msgstr ""
 "%2"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9152,8 +9352,8 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
@@ -9161,20 +9361,20 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Melding"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Lagrar mappe"
@@ -9220,7 +9420,7 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, fuzzy, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9230,28 +9430,28 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, fuzzy, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "�%s� er ikkje ei vanleg fil."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, fuzzy, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9269,13 +9469,13 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9284,7 +9484,7 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -9293,46 +9493,46 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9489,50 +9689,50 @@ msgstr "Avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operasjonen vart avbroten"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Sentrer dei valte elementa"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og sl� saman"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Kjende program"
@@ -9552,7 +9752,7 @@ msgstr "&La e-posten liggja p� tenaren."
 msgid "Delete after %s day(s)"
 msgstr "Slett denne adressa"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9573,6 +9773,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9582,50 +9787,52 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "Autentisering:"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "I/U-feil"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9650,35 +9857,35 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Vidaresendt melding fr� %1"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9790,43 +9997,43 @@ msgstr "Autentisering:"
 msgid "Authentication required"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Meldinga ser ikkje ut til � vere skikkeleg forma"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9834,94 +10041,94 @@ msgid ""
 "\n"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "M�te"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr ""
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Feil svar p� RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -9929,92 +10136,92 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Feil svar p� RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u oktettar"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet fr� lista"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "er ei vanleg fil"
@@ -10033,74 +10240,86 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Fr�:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
-#. * Subject:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Fr�:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn p� meldinga."
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10109,53 +10328,53 @@ msgstr ""
 "Feil ved lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "�tvaring:"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fila eksisterar, skriv over?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil ved lasting av fil %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikkje motta fil"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10164,13 +10383,13 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -10180,58 +10399,54 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "�tvaring: Melding er endra"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Set inn fil"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Lagre signatur"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (standard)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Skriv ei melding"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, 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:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10293,8 +10508,8 @@ msgstr "Emne inneheld"
 msgid "Subject does not contain"
 msgstr "Emne inneheld ikkje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10302,12 +10517,11 @@ msgstr ""
 "Ei fil med det namnet finst alt.\n"
 "Vil du skrive over den?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10406,159 +10620,114 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "�r"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "�r"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekund"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�nad"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minutt"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "m�nader"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "time"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "veke"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "veker"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "time"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�nad"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minutt"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "m�nader"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekund"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "�r"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "�r"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Du har gl�ymt � velje ein dato."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Du har vald ein ugyldig dato."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "tid no"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "ei tid du spesifiserar"
-
-#: filter/filter-datespec.c:370
-#, fuzzy
-msgid "a time relative to the current time"
-msgstr "Vis hendingane for denne dagen"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-#, fuzzy
-msgid "Select a time to compare against"
-msgstr "Vel ei biletefil"
-
-#. The label
-#: filter/filter-datespec.c:428
-#, fuzzy
-msgid "Compare against"
-msgstr "Kompilator�tvaringar"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klikk her for � velje ein dato>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "no"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " sidan"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%d. %a %b %Y"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "sidan"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " sidan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
+#: filter/filter-datespec.c:407
 #, fuzzy
-msgid "%b %d %l:%M %p"
-msgstr "%d. %b %k:%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<klikk her for � velje ein dato>"
+msgid "Select a time to compare against"
+msgstr "Vel ei biletefil"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stilnamn:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vel ei handling:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Legg til handling"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10567,93 +10736,161 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Viktig"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "etter"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Du gi dette filteret eit namn."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Dersom"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 #, fuzzy
 msgid "Execute actions"
 msgstr "K�yr autorun.sh"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "inkomande"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "Utg�ande"
 
 #: filter/filter.glade.h:1
+#, fuzzy
+msgid "Compare against"
+msgstr "Kompilator�tvaringar"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Rediger filter"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Rediger vMapper"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Innkomande"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Utg�ande"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+#, fuzzy
+msgid "a time relative to the current time"
+msgstr "Vis hendingane for denne dagen"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "sidan"
+
+#: filter/filter.glade.h:25
 #, fuzzy
 msgid "specific folders only"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "tid no"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "ei tid du spesifiserar"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vMappe-kjelder"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10680,42 +10917,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Firma"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "inneheld"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dato motteke"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Sletta"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "sluttar ikkje med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "finst ikkje"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "finst ikkje"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "h�yres ikkje ut som"
@@ -10737,94 +10974,90 @@ msgid "ends with"
 msgstr "sluttar med"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Eksisterar"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "eksisterar"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttrykk"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Viktig"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "er"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "var etter"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "var f�r"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Flagga"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "er st�rre enn"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "er mindre enn"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "er ikkje"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Flagga"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-postliste"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Meldingskropp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Header"
 msgstr "Melding motteken"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flytt til mappe"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Send melding til kontakt"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Les"
 
@@ -10840,58 +11073,88 @@ msgstr ""
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "er st�rre enn"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "er mindre enn"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Avsendar"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Sett status"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Storleik (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "h�yres ut som"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "Set opp konto"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "byrjar med"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Sett status"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Linjer"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -10900,11 +11163,11 @@ msgstr "Rediger regel"
 msgid "Score Rules"
 msgstr "Rediger filterreglar"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Du m� gi denne mappa eit namn."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10912,31 +11175,31 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerar ..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Venlegast vent"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerar %s som %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sender %1"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "E-post"
 
@@ -10993,42 +11256,42 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Leitar etter tilleggsmodular"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Startar importering"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Rediger filter"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11113,12 +11376,12 @@ msgstr "�ydelagd oppsettfil."
 msgid "Font Preferences"
 msgstr "Repetering"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Kontoar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11170,7 +11433,7 @@ msgstr "Eigenskapar ..."
 msgid "Change this folder's properties"
 msgstr "Endra namnet p� spelarane"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11178,60 +11441,80 @@ msgstr ""
 "Nokre av e-postinstillingane dine ser ut til � vere �ydelagde, sjekk at alt "
 "er i orden."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Du har ikkje sett opp ein transportmetode for e-post"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "�tvaring: Melding er endra"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Skriv ei melding"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Ny melding"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Forrige melding"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Ny e-postmelding"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Klarar ikkje initialisere Evolution sin e-postkomponent"
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr " Koplar til tenar ..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Klarar ikkje � registrer lager med skal"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Eigenskapar for �%s�"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Klarte ikkje � lage mellombels katalog: %s"
@@ -11281,137 +11564,137 @@ msgstr "%d totalt"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "vMappe p� _emne"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "vMappe p� avse_dar"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "vMappe p� mottaka_r"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "vMappe p� e-post_liste"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtr�r p� _emne"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtr�r p� avsen_dar:"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 #, fuzzy
 msgid "Filter on _Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Ferdig"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "T�m"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marker som uvi_ktig"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Slett"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsendar i adresseboka"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Bruk filter"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mapper"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr�r p� e-postliste (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Fil alt i liste"
@@ -11478,79 +11761,68 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "KDeelop-installering"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker p� at du vil sletta denne klassen?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Ikkje slett"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Verkeleg slette konto?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Skru av"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Skru p�"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-#, fuzzy
-msgid "Are you sure you want to delete this news account?"
-msgstr "Er du sikker p� at du vil sletta denne klassen?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "P�"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Konton_amn:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11560,31 +11832,31 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "Melding til %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding fr� %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "E-post&liste for spr�ket:"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Filter-reglar"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11592,7 +11864,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11604,7 +11876,7 @@ msgstr ""
 "eller skrive e-post.\n"
 "Vil du sette opp dette no?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11612,7 +11884,7 @@ msgstr ""
 "Du m� sette opp ein identitet\n"
 "f�r du skrive e-post."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11621,7 +11893,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11629,18 +11901,18 @@ msgstr ""
 "Du sender ei HTML-formattert melding, men den f�lgjande mottakeren vil ikkje "
 "ha HTML-formatter e-post:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11648,11 +11920,11 @@ msgstr ""
 "Sidan kontaktlista du sender til, er sett opp til � g�yme addressatane, vil "
 "den sette opp alle mottakarane som Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldinga inneheld kun Bcc-mottakarar."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11662,90 +11934,86 @@ msgstr ""
 "�Apparently-To�-topptekst.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakarar for � sende denne meldinga."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Du m� setje opp ein konto f�r du kan sende denn e-posten."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "P� %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil sletta %1?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 #, fuzzy
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil fjerna %1?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ingen meldingar vald!"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Skriv over fil?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Lagre melding som ..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Lagre meldingar som ..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Vis informasjonsmelding"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11753,35 +12021,35 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Utskrift av melding feila"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil sletta denne overf�ringa?"
@@ -11802,7 +12070,7 @@ msgstr "Ingen skildring"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt utan namn"
@@ -11825,15 +12093,14 @@ msgstr "Lagre signatur"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -11843,61 +12110,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "etter"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Sjekkar teneste"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 #, fuzzy
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
@@ -12159,453 +12399,436 @@ msgstr "Lagre og lukk"
 msgid "Loading Images"
 msgstr "Last b_ileter"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Meldingsvisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP-tenar:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Diskusjonsgruppetenarar"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Valfri informasjon"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-lykje ID:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "&Innhald ..."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan ikkje opne melding"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Husk dette passordet"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Svar-til:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Val for mottak"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Husk dette passordet"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Required Information"
 msgstr "Tenarinformasjon"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Forvald"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Tryggleik"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Trygg MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vel PGP-bin�r"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentisering:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tenar-oppsett"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Snarvegar"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Lagre signatur"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Lagre signatur"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Kjelde"
-
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Source Information"
-msgstr "Tenarinformasjon"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Stilnamn:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Aust"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringtype: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "enkle innlegg"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Forventar %1"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Forvald"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Skru p�"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Vidaresend som"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Fullt namn:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-e-post"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Last alle bileta i ein katalog"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gjer _dette til min standardkonto"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Last aldri bileter fr� _nettet"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mottak av e-post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Svar til alle"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Vis tid som"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Bruk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_kvar"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12634,216 +12857,226 @@ msgstr "Kunne ikkje laga kio-jobb.\n"
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Klarte ikkje � lage mellombels katalog: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Lagra til disk ..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Vis innvevd"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Opne i %s ..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "G�ym"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Ekstern visar"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Last b_ileter"
+
+#: mail/mail-display.c:1454
 #, fuzzy
 msgid "Loading message content"
 msgstr "Markerer meldingar"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d. %b %k:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenkje som "
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Lagre  bilete som ..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s vedlegg"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ugyldig addresse"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fr�"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Lagre melding som ..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Les mapper"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Klarar ikkje � lagre mappemetainfo til %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Set opp %1"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12852,7 +13085,7 @@ msgstr ""
 "Feil ved �%s�:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12861,7 +13094,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Arbeidar"
 
@@ -12870,109 +13103,109 @@ msgstr "Arbeidar"
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender �%s�"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Melding"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe �%s�"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 #, fuzzy
 msgid "Expunging folder"
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentat melding %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12981,38 +13214,33 @@ msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje � skrive data: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar fr� %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s p� nytt"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_S�k"
 
@@ -13067,32 +13295,41 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Send og motta e-post"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Oppdaterar ..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Fjern denne oppf�ringa"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
@@ -13119,7 +13356,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Namn:"
 
@@ -13149,7 +13386,7 @@ msgstr "Vidaresendt melding - %s"
 msgid "Forwarded message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Vidaresendt melding"
 
@@ -13163,7 +13400,7 @@ msgstr "Set opp vMappe: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13172,94 +13409,98 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Ikkje noko emne)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - melding"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "H�gare"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "H�gast"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "I dag, %H:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %H:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%d. %b %k:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -13294,47 +13535,47 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Storleik"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "G� framover"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Tenarinformasjon"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Vidaresend"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "F�rehandsvisning"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13358,16 +13599,16 @@ msgstr "Abbonerar p� mappe �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Mottek meldingar fr� %1"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
@@ -17832,11 +18073,11 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23257,8 +23498,8 @@ msgstr "Ingen skildring"
 msgid "Mail summary"
 msgstr "Postsamandrag"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -23276,15 +23517,15 @@ msgstr "ENOV:ENGM"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictinary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Tips for dagen"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Legg til ei nyhendekjelde"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Oppgi URLen p� den nyhendekjelda du vil leggje til"
 
@@ -23296,27 +23537,27 @@ msgstr "Feil ved nedlasting av RDF"
 msgid "News Feed"
 msgstr "Nyhendekjelde"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Le_gg til"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Ingen oppg�ver"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Ingen skildring)"
 
@@ -24701,7 +24942,7 @@ msgstr "Oppg�ver"
 
 #: my-evolution/my-evolution.glade.h:17
 #, fuzzy
-msgid "Weather settings"
+msgid "Weather Settings"
 msgstr "Toppinnstillingar"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24762,7 +25003,7 @@ msgstr "Vis detaljar"
 msgid "Cancel Operation"
 msgstr "Avbryt operasjon"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24774,20 +25015,20 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Add a Folder"
 msgstr "Vel mappe"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Kladd"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Sendt"
 
@@ -25002,20 +25243,15 @@ msgstr ""
 "\""
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Opprett ny mappe"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Lag _ny mappe ..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
 
@@ -25032,7 +25268,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Vel informasjonen du vil importere:"
 
@@ -25060,32 +25296,28 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Du kan berre importere til lokale mapper"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, fuzzy, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr "Det er ikkje band i stasjonen."
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25094,74 +25326,74 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil ved asting av %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Import�r data og innstillinga fr� eldre program"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "Flyttar"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Fr� %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import�r"
 
@@ -25210,9 +25442,14 @@ msgstr "Leitar etter tilleggsmodular"
 msgid "in \"%s\" ..."
 msgstr "Opne i %s ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kan ikkje laga fila\n"
 "\""
@@ -25229,8 +25466,8 @@ msgstr "Kan ikkje initialisera adresseboka"
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -25282,56 +25519,56 @@ msgstr "Flytt til mappe"
 msgid "Select the folder that you want to open"
 msgstr "Vel det ikontemaet du vil bruka:"
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 #, fuzzy
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vel katalogen som inneheld tenestene"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Arbeid _fr�kopla"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Arbeid fr�kopla"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25339,12 +25576,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, fuzzy, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikkje setja blokkstorleik for band."
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25352,150 +25589,160 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Ugyldig(e) argument"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Endra snarveg for:"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Gruppenamn:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, fuzzy, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Vil du verkeleg leggja '%1' i papirkorga?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Ikkje fjern"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Sm� ikon"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 #, fuzzy
 msgid "_Large Icons"
 msgstr "Ordna ikon"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Ny gruppe ..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Lagar eit nytt dokument"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Fjern gruppe"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Fjern denne oppf�ringa"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "&Programsn�ggtastar"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Lagar eit nytt dokument"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Lagar eit nytt dokument"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Gi snarveg nytt namn"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Gi valde snarvegar nytt namn til:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Opne i nytt _vindauge"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Opna dokumentet i eit nytt vindauge"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Gi denne snarvegen nytt namn"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Fj_ern"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarvegen fr� snarvegstolpen"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av snavegar."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
@@ -25504,64 +25751,64 @@ msgstr "Snarvegar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip � senda."
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Mappa er ikkje tom"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje st�tta p� tenar"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikkje flytta ei foreldremappe inn i ei barnemappe."
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Leitar etter tilleggsmodular"
@@ -25606,66 +25853,66 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Avbroten"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Har allereide ein eigar"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Ingen eigar"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "Fann ikkje fil"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Vel modemtype ..."
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Ust�tta skjema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Ust�tta operasjon"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Eksisterar"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Vidaresendt melding"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Ikkje noko plass att"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Gammal eigar har d�ydd"
 
@@ -25692,6 +25939,26 @@ msgstr "Vert"
 msgid "The following connections are currently active:"
 msgstr "F�lgjande konto(ar) er\n"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktar: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Send"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Oppg�ver"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappenamn:"
@@ -25705,6 +25972,34 @@ msgstr "Mappetype:"
 msgid "Specify where to create the folder:"
 msgstr "Ikkje nok skip � senda."
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Lag _ny mappe ..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Mappenamn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Tenarnamn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Br_ukarnamn:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -25797,15 +26092,15 @@ msgstr "Ikkje sp�r meg igjen"
 msgid "Evolution can import data from the following files:"
 msgstr "Bruk p� f�lgjande delar:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avsluttar no ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25825,54 +26120,54 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ikkje sp�r meg igjen"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Sl� av oppstartsskjerm"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar importering"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar importering"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
@@ -25911,127 +26206,119 @@ msgstr "Kopier utval"
 msgid "Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Opprett ny kontak"
-
-#: ui/evolution-addressbook.xml.h:7
-#, fuzzy
-msgid "Create new contact list"
-msgstr "Lagar eit nytt dokument"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut valde omr�de"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lim inn fr� utklippstavla"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 #, fuzzy
 msgid "Previews the contacts to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "F�rehands_vising av utskrift"
+
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "&Innhald ..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Vel alle"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vel alle kontatene"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Slett den valte oppg�va"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Lagra side til ascii-fil"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Stopp lasting"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "tid no"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlingar"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "&Innhald ..."
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Vidaresend kontakt ..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Lagra som"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "Slett kolonne"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Vel alt"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
@@ -26078,11 +26365,6 @@ msgstr "M�nad"
 msgid "Previews the calendar to be printed"
 msgstr "Sen melding"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "F�rehands_vising av utskrift"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -26117,7 +26399,7 @@ msgstr "Veke"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Lukk"
 
@@ -26131,7 +26413,7 @@ msgid "Delete this item"
 msgstr "Slett dette elementet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hovudverktylinje"
 
@@ -26144,8 +26426,8 @@ msgstr "Sen melding"
 msgid "Print this item"
 msgstr "Skriv ut dette elementet"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Lagre"
 
@@ -26170,9 +26452,9 @@ msgstr "Lagre dette elementet til disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fil"
 
@@ -26182,7 +26464,7 @@ msgstr "Skriv ut kon_volutt ..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "L_agre som ..."
 
@@ -26197,8 +26479,8 @@ msgstr "Sender ei melding til ein nettverksspelar"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -26307,28 +26589,38 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Ny melding"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Mottek meldingar fr� %1"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Vis meldings-f�rehandsvisningsvindauge"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "Mapper"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filter ..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "F�rehandsvis i"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Leitar etter tilleggsmodular"
@@ -26438,7 +26730,7 @@ msgstr "Tr�da meldingsliste"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Mappe"
 
@@ -26727,189 +27019,204 @@ msgstr "Forrige ulesne melding"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Oppg�vesvar"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Berre sjekk for ny e-post."
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Forrige viktige melding"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "F�rehandsvis meldinga som skal skrivast ut"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Forrige"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Skriv ut denne meldinga"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Sett tilbake teksta til det opprinnelege"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "S_�k i meldingar ..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "M_indre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Lagre melding som tekstfil"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
 msgstr "Skriv tittelen p� ruta her."
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Endre sideoppsett for aktiv skrivar"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Vis e-post _kjeldekode"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Vis heile meldings_hovudet"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Vis melding p� normal m�te"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Vis melding med alle meldingshovud"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Vis den r� kjeldekoda til meldinga"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Tekststorle_ik"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Sentrer dei valte elementa"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "VFolder on Mailing _List..."
 msgstr "Fil alt i liste"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Mappenamn:"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "VFolder on _Recipients..."
 msgstr "Mappa finst: "
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "VFolder on _Subject..."
 msgstr "Ingen emne"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Legg ved"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopi�r til mappe"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Opprett filter fr� melding"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Vidaresend melding"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "G� til"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Innvevd"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_St�rre"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Neste melding"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Opne melding"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Sitert"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Omd�yp ..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "Verk_ty"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Visning"
 
@@ -26937,169 +27244,161 @@ msgstr "Krypt�r denne meldinga med ditt S/MIME-krypteringssertifikat"
 msgid "For_mat"
 msgstr "Form_at"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Sett inn ei fil som tekst i meldinga"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Sett inn tekstfil ..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Opne"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Opne ei fil"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP-krypt�r"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP-sign�r"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME-krypt�r"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME-sign�r"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lagre som"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Lagre _kladd"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Lagre i mappe ..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Lagre fila med eit anna namn"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldinga i spesifisert mappe"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Send _seinare"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Send _seinare"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Send meldinga i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Send meldinga seinare"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Send denne meldinga no"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Vis/g�ym vedlegg"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signer denne meldinga med din PGP-n�kkel"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sign�r denne meldinga med ditt S/MIME signatursertifikat"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Avgjer om BCC-feltet vert vist"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Avgjer om CC-feltet vert vist"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Avgjer om Fr�-veljaren vert vist"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Avgjer om Svar-Til-feltet vert vist"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Vedlegg ..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Bcc-felt"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Cc-felt"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "S_lett alle"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Fr� felt"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Set _inn"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Opne ..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Reply-To felt"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Lagre aktiv fil"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hjelp"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Lagre signatur"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe til liste over abbonerte mapper"
@@ -27198,172 +27497,204 @@ msgid "Add to _Shortcut Bar"
 msgstr "Legg til _snarvegstolpe"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Endra namnet p� denne mappa"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopier denne mappa"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Lag _ny mappe ..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Lag ei lenkje til denne mappa i snarvegstoplen"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Lag ei ny mappe"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Lagar eit nytt dokument"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Lag ei ny mappe"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Slett denne mappa"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Vis ei anna mappe"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Avslutt"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _vindauge"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Flytt denne mappa til ein annan plass"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Lag _ny mappe ..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Opne i eige vindauge"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Opne denne mappe i eit anna vindauge"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilot-innstillingar"
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Send k�a meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Oppsett for post"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Byt"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Avgjer om snarvegstolpen skal vise"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Vis den valde mappa"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution ..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopier ..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Mappestolpe"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mappe"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_G� til mappe"
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Import�r ..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Flytt ..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot-innstillingar"
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Repetering"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Omd�yp ..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Mottakar"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Snarveg"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Snarvegstolpe"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Snarveg"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut samandrag"
@@ -27377,17 +27708,40 @@ msgid "Reload the view"
 msgstr "Last om att visning"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adressekort"
+#, fuzzy
+msgid "By _Company"
+msgstr "Etter firma"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Etter firma"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adressekort"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonliste"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vekesvisning"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dagsvisning"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "M�nadsvising"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Arbeidsvekevisning"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27413,14 +27767,19 @@ msgstr "Etter emne"
 msgid "Messages"
 msgstr "Meldingar"
 
-#: views/tasks/galview.xml.h:2
+#: views/tasks/galview.xml.h:1
 #, fuzzy
-msgid "With Category"
+msgid "With _Category"
 msgstr "Kategori"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Oppg�ve"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27571,11 +27930,11 @@ msgstr "Teiknkoding"
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -27615,21 +27974,21 @@ msgstr "Melding"
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Finn no"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "T�m"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Finn no"
 
@@ -27643,19 +28002,99 @@ msgstr "Den personlege addresseboktenaren"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personleg kalendertenar: kalendarfabrikk"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): klarte ikkje � initialisere GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): klarte ikkje initialisere GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Flytt ..."
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Slett _denne avtalen"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/U-feil"
+
+#~ msgid "Insert File"
+#~ msgstr "Set inn fil"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Du har vald ein ugyldig dato."
+
+#, fuzzy
+#~ msgid "Evolution News Editor"
+#~ msgstr "KDeelop-installering"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Er du sikker p� at du vil sletta denne klassen?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Du m� setje opp ein konto f�r du kan sende denn e-posten."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP-tenar:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Diskusjonsgruppetenarar"
+
+#~ msgid "Source"
+#~ msgstr "Kjelde"
+
+#, fuzzy
+#~ msgid "Source Information"
+#~ msgstr "Tenarinformasjon"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Lagra til disk ..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Lagre melding som ..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Opprett ny mappe"
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Du kan berre importere til lokale mapper"
+
+#, fuzzy
+#~ msgid "_Contact List"
+#~ msgstr "&Innhald ..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Sett inn ei fil som tekst i meldinga"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Sett inn tekstfil ..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Send _seinare"
+
+#~ msgid "Send _later"
+#~ msgstr "Send _seinare"
+
+#~ msgid "Send the message later"
+#~ msgstr "Send meldinga seinare"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot-innstillingar"
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Addressebokkjelder"
 
@@ -27771,10 +28210,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Slett alt utanom signatur"
 
@@ -28120,12 +28555,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Vis kontakter som stemmer med desse kriteria:"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Lag ein ny avtale"
-
-#~ msgid "Create a new task"
-#~ msgstr "Opprett ei ny oppg�ve"
-
 #~ msgid "New _Task"
 #~ msgstr "Ny oppg�ve"
 
@@ -28201,10 +28630,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgstr "Slett e-post fr� tenaren"
 
 #, fuzzy
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Kunne ikkje starta underprosess."
-
-#, fuzzy
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
@@ -28294,10 +28719,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "E-post lagrinsmappe (intern)"
 
-#, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Ny e-post_melding"
 
@@ -28362,10 +28783,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgstr "_Organisasjon:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "Fjern denne oppf�ringa"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Send meldingar:"
 
@@ -28452,9 +28869,6 @@ msgstr "init_bonobo(): klarte ikkje � initialisere Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "_Oppg�ve ..."
 
-#~ msgid "New Message"
-#~ msgstr "Ny melding"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_Innstillingar for e-post ..."
 
diff --git a/po/no.po b/po/no.po
index 6d7bb30e44..13984a505b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-07-26 11:50+0200\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-26 15:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -343,7 +343,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "S�ker..."
 
@@ -356,31 +356,31 @@ msgstr "Laster..."
 msgid "Error in search expression."
 msgstr "Feil i s�keuttrykk."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort p� LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Starter s�k p� nytt."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Mottar s�keresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Feil ved utf�ring av s�k"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Kunne ikke tolke streng i sp�rring"
 
@@ -471,11 +471,11 @@ msgstr ""
 "Denne siden kan brukes til � konfigurere tilgang til LDAP-katalogtjenere."
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1073
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -491,31 +491,30 @@ msgstr "LDAP-tjener"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener s�mme inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "Ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "Kontakt_liste"
-
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Create a new contact list"
-msgstr "Opprett en ny kontaktliste"
-
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:584
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:585
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Ny kontaktliste"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "Kontakt_liste"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "Opprett en ny kontaktliste"
+
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
@@ -557,11 +556,11 @@ msgstr "Kunne ikke initiere gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke �pne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -571,7 +570,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "er nede"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -583,7 +582,7 @@ msgstr ""
 "m� du kompilere programmet fra kildekoden i CVS etter �\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -591,42 +590,42 @@ msgstr ""
 "Kunne ikke �pne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til � aksessere den."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Skriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-post er"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avansert..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -743,7 +742,7 @@ msgstr "Legg til (eller rediger) mapping av attributter"
 msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Alltid"
@@ -828,7 +827,7 @@ msgstr "Konfigurasjonsassistent for LDAP"
 msgid "Mappings"
 msgstr "Mappinger"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
 #: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Aldri"
@@ -879,7 +878,7 @@ msgstr "S�_keomr�de: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1978 calendar/gui/e-day-view.c:1709
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
 #: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "S�ker"
@@ -1069,15 +1068,15 @@ msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "N�r mulig"
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:136 shell/glade/e-folder-list.glade.h:1
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Legg til"
 
@@ -1117,8 +1116,8 @@ msgstr "_Ikke bruk SSL/TLS"
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:151 ui/evolution-addressbook.xml.h:37
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1225,9 +1224,9 @@ msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:692
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:552
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Fjern"
@@ -1257,11 +1256,11 @@ msgstr "(%d ikke vist)"
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:510
+#: addressbook/gui/component/select-names/e-select-names.c:511
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:547
+#: addressbook/gui/component/select-names/e-select-names.c:544
 msgid "Find contact in"
 msgstr "Finn kontakt i"
 
@@ -1395,10 +1394,10 @@ msgstr "Vil motta _HTML e-post"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3632
-#: calendar/gui/e-week-view.c:3510 filter/filter.glade.h:8
-#: mail/folder-browser.c:1725 mail/mail-config.glade.h:149
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
@@ -2634,7 +2633,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser n�r du sender e-post til listen"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -2724,13 +2723,13 @@ msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Suksess"
 
@@ -2738,7 +2737,7 @@ msgstr "Suksess"
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
 #: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1123
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -2747,7 +2746,7 @@ msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
@@ -2764,7 +2763,7 @@ msgid "Protocol not supported"
 msgstr "Protokollen er ikke st�ttet"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1187
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2785,46 +2784,51 @@ msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Filen %s eksisterer ikke"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Feil under tillegg av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Feil ved tillegg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Vis kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Vis kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2835,19 +2839,19 @@ msgstr ""
 "vil\n"
 "vises p� skjermen. Vil du virkelig vise alle disse kortene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopier kort til"
 
@@ -2919,7 +2923,7 @@ msgstr "Adressebok"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
@@ -2952,7 +2956,7 @@ msgid "Pilot Settings..."
 msgstr "Innstillinger for pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
@@ -2961,7 +2965,7 @@ msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
@@ -2980,7 +2984,7 @@ msgid "Move to folder..."
 msgstr "Flytt til mappe..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
@@ -2991,20 +2995,20 @@ msgid "Copy"
 msgstr "Kopier"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slett"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr "Aktiv visning"
 
@@ -3258,26 +3262,26 @@ msgstr "Avtale uten navn"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:734
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "H�y"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1705
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:733
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Udefinert"
@@ -3396,11 +3400,11 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:674
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:734
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3412,13 +3416,13 @@ msgstr ""
 "� sende e-post. Evolution vil vise en vanlig dialog\n"
 "for p�minnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:752
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2710
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:757
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3435,7 +3439,7 @@ msgstr ""
 "\n"
 "Er du sikker p� at du �nsker � kj�re dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:771
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Ikke sp�r meg om dette programmet igjen."
 
@@ -3463,7 +3467,7 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1098
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Ingen treff"
 
@@ -3496,19 +3500,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:977
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidensiell"
@@ -3533,37 +3537,37 @@ msgstr "�"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1137
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Opptatt"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1181
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Fullf�rt"
 
-#: calendar/gui/calendar-model.c:1039
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3574,34 +3578,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1179 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1904
-#: mail/folder-browser.c:1687 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:453
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
 #: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: mail/message-tag-followup.c:67
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1715 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nei"
 
@@ -3623,7 +3626,7 @@ msgstr "M�nedsvisning"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
 #: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1065
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3631,12 +3634,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mappe som inneholder avtaler og hendelser"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
 #: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1069
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -3644,54 +3647,54 @@ msgstr "Oppgaver"
 msgid "Folder containing to-do items"
 msgstr "Mappe som inneholder oppgaver"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "A_vtale"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Opprett en ny avtale"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nytt m�te"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "M�_te"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 msgid "Create a new meeting request"
 msgstr "Dette er en m�teforesp�rsel"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "Ny avtale for hele dagen"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "Avtale for hele _dagen"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 msgid "Create a new all-day appointment"
 msgstr "Opprett en ny avtale for hele dagen"
 
-#: calendar/gui/component-factory.c:721
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: calendar/gui/component-factory.c:721
-msgid "_Appointment"
-msgstr "A_vtale"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3757,7 +3760,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Med disse argumentene:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dager"
 
@@ -3765,11 +3769,13 @@ msgstr "dager"
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutter"
 
@@ -3926,7 +3932,7 @@ msgstr "slutt p� avtale"
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:183
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4099,7 +4105,7 @@ msgid "_Fri"
 msgstr "_Fr."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Generell"
 
@@ -4277,22 +4283,22 @@ msgstr "Journaloppf�ring - %s"
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1204
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3845
-#: calendar/gui/e-week-view.c:3742 composer/e-msg-composer.c:1048
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1305
-#: calendar/gui/dialogs/comp-editor.c:1329
-#: calendar/gui/dialogs/comp-editor.c:1353
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 "Endringer som gj�res i denne oppf�ringen kan bli forkastet hvis en "
 "oppdatering kommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1380
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -4585,7 +4591,7 @@ msgstr "p�"
 msgid "first"
 msgstr "f�rste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:87
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
@@ -4605,7 +4611,7 @@ msgstr "siste"
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
@@ -4703,20 +4709,26 @@ msgstr "% ferdig"
 msgid "Date Completed:"
 msgstr "Fullf�rt dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Trenger handling"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -4799,76 +4811,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2758
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
 #: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3614
-#: calendar/gui/e-week-view.c:3492 mail/folder-browser.c:1698
-#: shell/e-shortcuts-view.c:389 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_�pne"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Lagre som..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3616
-#: calendar/gui/e-week-view.c:3466 calendar/gui/e-week-view.c:3494
-#: ui/evolution-addressbook.xml.h:42 ui/evolution-calendar.xml.h:30
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3621
-#: calendar/gui/e-week-view.c:3499 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3622
-#: calendar/gui/e-week-view.c:3500 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3585
-#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3470
-#: calendar/gui/e-week-view.c:3501 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Merk som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullf�rt"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7473
-#: calendar/gui/e-week-view.c:4231
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for � legge til en oppgave"
@@ -4877,8 +4889,8 @@ msgstr "Klikk for � legge til en oppgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:969
-#: camel/camel-filter-driver.c:1077
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Fullf�rt"
 
@@ -4908,7 +4920,7 @@ msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:51 shell/e-shell.c:740
-#: shell/e-shortcuts.c:1057
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -4974,80 +4986,80 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3569
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3573 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "Nytt m�te"
 
-#: calendar/gui/e-day-view.c:3575 calendar/gui/e-week-view.c:3462
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-day-view.c:3580 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3476
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "G� _til i dag"
 
-#: calendar/gui/e-day-view.c:3594 calendar/gui/e-week-view.c:3477
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_G� til dato..."
 
-#: calendar/gui/e-day-view.c:3599 calendar/gui/e-week-view.c:3481
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-day-view.c:3604 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Konfigurer..."
 
-#: calendar/gui/e-day-view.c:3606 calendar/gui/e-week-view.c:3486
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "_Konfigurer pilot..."
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3493
-#: mail/folder-browser.c:1700 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-day-view.c:3627 calendar/gui/e-week-view.c:3505
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp m�te..."
 
-#: calendar/gui/e-day-view.c:3628 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3633 calendar/gui/e-week-view.c:3511
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Gj�r denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3634 calendar/gui/e-week-view.c:3512
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3635 calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-day-view.c:3997 calendar/gui/e-week-view.c:3870
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
 #: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verkt�yene ser ikke ut til � v�re installert p� dette systemet."
 
-#: calendar/gui/e-day-view.c:4003 calendar/gui/e-week-view.c:3876
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
 #: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
@@ -5124,28 +5136,28 @@ msgid "Status:"
 msgstr "Status:"
 
 #: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
 #: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Avsl�tt"
 
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1230 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:849 widgets/misc/e-charset-picker.c:58
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Ukjent"
@@ -5191,242 +5203,242 @@ msgstr "Oppdater status for respondent"
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1124
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:1125
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "M�teinformasjon"
 
-#: calendar/gui/e-itip-control.c:1129
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> foresp�r din tilstedev�relse i et m�te."
 
-#: calendar/gui/e-itip-control.c:1130
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "M�teforslag"
 
-#: calendar/gui/e-itip-control.c:1134
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �nsker � legge til informasjon i et eksisterende m�te."
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "M�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1139
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �nsker � motta seneste m�teinformasjon."
 
-#: calendar/gui/e-itip-control.c:1140
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Foresp�rsel om m�teoppdatering"
 
-#: calendar/gui/e-itip-control.c:1163
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart p� en m�teforesp�rsel."
 
-#: calendar/gui/e-itip-control.c:1164
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "M�tesvar"
 
-#: calendar/gui/e-itip-control.c:1168
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et m�te."
 
-#: calendar/gui/e-itip-control.c:1169
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "M�teavlysing"
 
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1246
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforst�elig melding."
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Ugyldig m�temelding"
 
-#: calendar/gui/e-itip-control.c:1196
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1197
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> foresp�r at du utf�rer en oppgave."
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Foresp�rsel om oppgave"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �nsker � legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1207
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �nsker � motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Foresp�rsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1236
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart p� en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1237
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Svar p� oppgave"
 
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1247
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> foresp�r din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt foresp�rsel"
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart p� en foresp�rsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1277
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1282
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1361
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til � v�re riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder foresp�rsler som ikke er st�ttet."
 
-#: calendar/gui/e-itip-control.c:1408 calendar/gui/e-itip-control.c:1414
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1574 calendar/gui/e-itip-control.c:1666
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1577 calendar/gui/e-itip-control.c:1669
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppsto en feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1580 calendar/gui/e-itip-control.c:1672
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke finnes\n"
 
-#: calendar/gui/e-itip-control.c:1583 calendar/gui/e-itip-control.c:1675
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til � oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1586
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Oppdatering fullf�rt\n"
 
-#: calendar/gui/e-itip-control.c:1589
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1618 calendar/gui/e-itip-control.c:1684
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppf�ringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:1639
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1651
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1678
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1681
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1716
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Fjerning fullf�rt"
 
-#: calendar/gui/e-itip-control.c:1746 calendar/gui/e-itip-control.c:1796
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Oppf�ring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1748 calendar/gui/e-itip-control.c:1800
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Oppf�ringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr "Velg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:1910
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr "Velg oppgavemappe"
 
@@ -5471,7 +5483,7 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
@@ -5484,57 +5496,52 @@ msgid "Non-Participants"
 msgstr "Ikke-deltakere"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuell"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Gruppe"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ressurs"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Rom"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Styremedlem"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Trenger handling"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativ"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegert"
 
@@ -5624,39 +5631,40 @@ msgstr "Tid for m�tets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for m�tets slutt:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�pner oppgaver p� %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i �%s�"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � laste �%s� er ikke st�ttet"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheter til � �pne mappen i �%s�"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr "Fullf�rer oppgaver..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "T�mmer"
 
-#: calendar/gui/e-week-view.c:3459
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
@@ -5670,11 +5678,16 @@ msgstr "Kunne ikke �pne mappen i �%s�"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er n�dvendig for � �pne �%s� er ikke st�ttet"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�pner kalender p� %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�pner mappe %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -5731,47 +5744,47 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "En organisator m� oppgis."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Du m� v�re en deltager i hendelsen."
 
@@ -6006,7 +6019,7 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2998
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Forh�ndsvisning av utskrift"
@@ -6042,8 +6055,8 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2482
-#: mail/mail-callbacks.c:2724
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ikke sp�r meg igjen."
 
@@ -6135,90 +6148,90 @@ msgstr ""
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "tid-n� forventer 0 argumenter"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "lag-tid forventer 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "lag-tid forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "argument 1 til make-time m� v�re en dato/tid streng p� ISO 8601 format"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "tid-add-day forventer 2 argumenter"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day forventer at argument 2 er et heltall"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin forventer 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end forventer 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end forventer at argument 1 er av type time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype forventer 0 argumenter"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? forventer at argument 1 er av type time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range forventer at argument 2 er av type time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "inneholder? forventer 2 argumenter"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? forventer at argument 1 er en streng"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? forventer at argument 2 er en streng"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains? forventer at argument 1 er en av �any�, �summary�, �description�"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? forventer minst 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6226,19 +6239,19 @@ msgstr ""
 "has-categories? forventer at alle argumenter er strenger eller ett, og kun "
 "ett, argument er den bolske verdien falsk (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? forventer 0 argumenter"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? forventer 1 argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? forventer at argument 1 er en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av s�keuttrykket ga ikke en boolsk verdi"
 
@@ -7831,52 +7844,52 @@ msgstr "Forbereder mappe �%s� p� frakobling"
 msgid "You must be working online to complete this operation"
 msgstr "Du m� arbeide tilknyttet for � fullf�re denne operasjonen"
 
-#: camel/camel-filter-driver.c:736 camel/camel-filter-driver.c:745
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:834 camel/camel-filter-driver.c:1220
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:1226
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kj�ring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:910
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke �pne spool-mappen"
 
-#: camel/camel-filter-driver.c:919
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: camel/camel-filter-driver.c:934
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:938
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Kan ikke �pne melding"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet p� melding %d"
 
-#: camel/camel-filter-driver.c:965 camel/camel-filter-driver.c:1072
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1039
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:1054
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet p� melding %d av %d"
@@ -7898,7 +7911,7 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Klarte ikke � opprette r�r til �%s�: %s"
 
-#: camel/camel-filter-search.c:547 mail/mail-ops.c:2319
+#: camel/camel-filter-search.c:547
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Feil under oppretting av underprosess �%s�: %s"
@@ -8272,7 +8285,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:847
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar p� autentisering fra tjener."
 
@@ -8444,33 +8457,134 @@ msgstr "Kan ikke finne mappe: Ugyldig operasjon p� dette lageret"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon p� dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Feil under verifisering av sertifikater."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Utsteder: %s\n"
-"Emne: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Feil under verifisering av sertifikater."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Ugyldig sertifikat fra %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Vil du akseptere likevel?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Velg en signaturfil"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Feil under lasting av %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Ute"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Feil under verifisering av sertifikater."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ugyldig argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8483,16 +8597,33 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "UGYLDIG"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Ugyldig sertifikat fra %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Vil du akseptere likevel?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8549,12 +8680,12 @@ msgstr "Kan ikke endre navn p� mappe: %s: Ingen slik mappe"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2295
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2298
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -8583,40 +8714,40 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar �OK� fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:235
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:301
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble �delagt og laget p� nytt p� tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:526
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "S�ker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2043
-#: camel/providers/imap/camel-imap-folder.c:2120
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2049
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "S�ker etter nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2417
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -8681,68 +8812,73 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved � bruke et klartekst-"
 "passord."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s p� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidelse er ikke st�ttet."
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:870
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mappen er ikke tom"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:880
+#: camel/providers/imap/camel-imap-store.c:1035
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen st�tte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:904
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:919
+#: camel/providers/imap/camel-imap-store.c:1074
 #: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:948
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8753,31 +8889,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1270
-#: camel/providers/imap/camel-imap-store.c:1398
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1670
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mappenavn kan ikke inneholde linjeskift."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke � ha undermapper"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postboks:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -8836,7 +8978,7 @@ msgstr ""
 "Kan ogs�  brukes til � lagre et tre av mapper i Elm, Pine eller Mutt-stil."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8847,38 +8989,38 @@ msgstr "Lagerrot %s er ikke en absolutt sti"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn p� �%s�: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe �%s�: %s"
@@ -8927,7 +9069,7 @@ msgstr "Ingen slik melding"
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
-#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
 #, c-format
 msgid ""
@@ -8937,14 +9079,14 @@ msgstr ""
 "Kan ikke �pne mappe �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen �%s� eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:116
+#: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
 #, c-format
 msgid ""
@@ -8954,43 +9096,43 @@ msgstr ""
 "Kunne ikke opprette mappe �%s�:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:131
+#: camel/providers/local/camel-maildir-store.c:132
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "�%s� er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe �%s�: %s"
 
-#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:168
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:334
+#: camel/providers/local/camel-maildir-store.c:335
 #: camel/providers/local/camel-spool-store.c:252
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke s�ke i mappe �%s�: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke �pne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Sjekker om mappen er konsistent"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
 #: camel/providers/local/camel-mbox-summary.c:583
 #: camel/providers/local/camel-mbox-summary.c:673
@@ -9295,47 +9437,47 @@ msgstr "Bruk avbryt"
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Bruker avbr�t"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan ikke hente POP-sammendrag: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen melding med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Ukjent �rsak"
 
@@ -9442,7 +9584,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen slik mappe �%s�."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9468,35 +9610,35 @@ msgstr "Kunne ikke opprette r�r til sendmail: %s: melding ikke sendt"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kj�re fork p� sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende meldingen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avsluttet med signal %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke kj�re %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avsluttet med status %d: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9662,7 +9804,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:683 mail/mail-ops.c:615
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Sender melding"
 
@@ -9769,54 +9911,54 @@ msgstr "Tidsavbrudd for QUIT-foresp�rsel: %s"
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppf�ringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke legge ved fil: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
@@ -9834,7 +9976,7 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Foresl� automatisk visning av vedlegg"
 
@@ -9902,7 +10044,7 @@ msgstr ""
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
@@ -9920,34 +10062,34 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: composer/e-msg-composer.c:1061
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1083
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1103
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1144
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1151
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9956,7 +10098,7 @@ msgstr ""
 "Kunne ikke s�ke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1158
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9965,7 +10107,7 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1167
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9974,7 +10116,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -9982,7 +10124,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du pr�ve � gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9992,15 +10134,15 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1455
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "�pne fil"
 
-#: composer/e-msg-composer.c:1827
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
@@ -10008,23 +10150,23 @@ msgstr ""
 "Kan ikke sette forvalgt signatur for denne kontoen. Kanskje kontoene er "
 "endret i mellomtiden?"
 
-#: composer/e-msg-composer.c:1864
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1905 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:1917
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr "Sett som forvalg"
 
-#: composer/e-msg-composer.c:2094 composer/e-msg-composer.c:2699
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2716
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10032,7 +10174,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke � aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2742 composer/e-msg-composer.c:2797
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10040,11 +10182,13 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke � aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:3649
+#: composer/e-msg-composer.c:3846
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke kan redigeres.)<b>"
+msgstr ""
+"<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
+"kan redigeres.)<b>"
 
 #: composer/evolution-composer.c:376
 msgid ""
@@ -10106,8 +10250,8 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2347
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10115,12 +10259,11 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:270
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:271
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk dette passordet for resten av denne sesjonen"
 
@@ -10218,122 +10361,72 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:81
-msgid "year"
-msgstr "�r"
-
-#: filter/filter-datespec.c:81
-msgid "years"
-msgstr "�r"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " sekunder"
 
-#: filter/filter-datespec.c:82
-msgid "month"
-msgstr "m�ned"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minutt"
 
-#: filter/filter-datespec.c:82
-msgid "months"
-msgstr "m�neder"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "time"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "uke"
 
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "uker"
 
-#: filter/filter-datespec.c:85
-msgid "hour"
-msgstr "time"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�ned"
 
-#: filter/filter-datespec.c:86
-msgid "minute"
-msgstr "minutt"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "m�neder"
 
-#: filter/filter-datespec.c:87 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr " sekunder"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "�r"
 
-#: filter/filter-datespec.c:196
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "�r"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Du har glemt � velge en dato."
 
-#: filter/filter-datespec.c:198
-msgid "You have chosen an invalid date."
-msgstr "Du har valgt en ugyldig dato."
-
-#: filter/filter-datespec.c:283
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med tiden\n"
-"n�r filteret kj�res eller tiden n�r vfolderen\n"
-"�pnes."
-
-#: filter/filter-datespec.c:306
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med\n"
-"tiden du spesifiserer her."
-
-#: filter/filter-datespec.c:346
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Meldingens dato vil bli sammenlignet med\n"
-"en tid relativ til n�r filteret blir kj�rt;\n"
-"for eksempel �for en uke siden�."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:381
-msgid "the current time"
-msgstr "tiden n�"
-
-#: filter/filter-datespec.c:381
-msgid "a time you specify"
-msgstr "en tid du spesifiserer"
-
-#: filter/filter-datespec.c:382
-msgid "a time relative to the current time"
-msgstr "en tid relativ til tiden n�"
-
-#. The dialog
-#: filter/filter-datespec.c:406
-msgid "Select a time to compare against"
-msgstr "Velg en tid � sammenligne mot"
-
-#. The label
-#: filter/filter-datespec.c:440
-msgid "Compare against"
-msgstr "Sammenligne med"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klikk her for � velge en dato>"
 
-#: filter/filter-datespec.c:558 filter/filter-datespec.c:737
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "n�"
 
-#: filter/filter-datespec.c:587
-msgid " ago"
-msgstr " siden"
-
-#: filter/filter-datespec.c:633
-msgid "ago"
-msgstr "siden"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:723 mail/message-list.c:1105
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " siden"
 
-#: filter/filter-datespec.c:734
-msgid "<click here to select a date>"
-msgstr "<klikk her for � velge en dato>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Velg en tid � sammenligne mot"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregler"
 
@@ -10368,7 +10461,7 @@ msgstr ""
 "Vennligst g� tilbake og spesifiser en gyldig mappe for levering av e-post."
 
 #: filter/filter-folder.c:237 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -10388,7 +10481,7 @@ msgstr "Viktig"
 
 #. red
 #: filter/filter-label.c:137 mail/mail-config.c:76
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:135
 msgid "Work"
 msgstr "Arbeid"
 
@@ -10399,7 +10492,7 @@ msgstr "Personlig"
 
 #. forest green
 #: filter/filter-label.c:139 mail/mail-config.c:78
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid "To Do"
 msgstr "Oppgaver"
 
@@ -10453,42 +10546,91 @@ msgid "outgoing"
 msgstr "utg�ende"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Sammenligne med"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Rediger filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Rediger VFoldere"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Utg�ende"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Meldingens dato vil bli sammenlignet med\n"
+"tiden du spesifiserer her."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Meldingens dato vil bli sammenlignet med\n"
+"en tid relativ til n�r filteret blir kj�rt;\n"
+"for eksempel �for en uke siden�."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Meldingens dato vil bli sammenlignet med\n"
+"tiden du spesifiserer her."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "en tid relativ til tiden n�"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "siden"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "kun spesifikke mapper"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "tiden n�"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "en tid du spesifiserer"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "med alle aktive eksterne mapper"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "med alle lokale og aktive eksterne mapper"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "med alle lokale mapper"
 
@@ -10617,7 +10759,7 @@ msgstr "er ikke"
 msgid "is not Flagged"
 msgstr "er ikke merket"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1735
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr "Etikett"
 
@@ -10645,7 +10787,7 @@ msgstr "Kj�r melding gjennom en skall-kommando"
 msgid "Play Sound"
 msgstr "Spill lyd"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Les"
 
@@ -10678,7 +10820,7 @@ msgstr "returnerer mindre enn"
 msgid "Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1654
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Avsender"
 
@@ -10714,20 +10856,30 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Emne"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Sett status"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
@@ -10771,7 +10923,7 @@ msgstr "S�ker i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:318
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Post"
 
@@ -10837,7 +10989,7 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1084
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "S�ppel"
@@ -10991,7 +11143,7 @@ msgstr "Egenskaper ..."
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:761
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -10999,227 +11151,242 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til � v�re korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:923
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/component-factory.c:945
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger, vil du avslutte likevel?"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:956
 msgid "Warning: Unsent Messages"
 msgstr "Advarsel: Usendte meldinger"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:992 ui/evolution-mail-global.xml.h:19
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/component-factory.c:993
+#: mail/component-factory.c:998
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/component-factory.c:1020
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "_Neste melding"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Post en melding"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Skriv en ny e-postmelding"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1029
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
 
-#: mail/component-factory.c:1035
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
 
-#: mail/component-factory.c:1260 mail/component-factory.c:1290
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: mail/component-factory.c:1301
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-ui.c:431
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for �%s�"
 
-#: mail/folder-browser-ui.c:433
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:335 mail/mail-display.c:841
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:763
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:766 mail/folder-browser.c:774
+#: mail/folder-browser.c:777
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d visible"
 msgstr "%d synlig"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:775
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:780
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:784
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1092
+#: mail/folder-browser.c:1091
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra s�k..."
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VFolder p� e_mne"
 
-#: mail/folder-browser.c:1672
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1673
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1674
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VFolder p� e-post_liste"
 
-#: mail/folder-browser.c:1678
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtrer p� em_ne"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtrer p� sen_der"
 
-#: mail/folder-browser.c:1680
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtrer p� motta_ker"
 
-#: mail/folder-browser.c:1681 mail/folder-browser.c:2015
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtrer p� e-_postliste"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1705 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1706 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1707 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr "F�l_g opp..."
 
-#: mail/folder-browser.c:1713
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullf�rt"
 
-#: mail/folder-browser.c:1714
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
 #. separator here?
-#: mail/folder-browser.c:1718 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/folder-browser.c:1726
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1731 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "_P�f�r filtre"
 
-#: mail/folder-browser.c:1747
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/folder-browser.c:2016
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "VFolder p� _e-postliste"
 
-#: mail/folder-browser.c:2018
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrer _p� e-postliste (%s)"
 
-#: mail/folder-browser.c:2019
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder _p� e-postliste (%s)"
@@ -11291,19 +11458,19 @@ msgstr "Du har ikke fylt ut all n�dvendig informasjon."
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:158
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:128
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:166
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
@@ -11349,30 +11516,30 @@ msgstr "Protokoll"
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr "F�lgende filter-regel/regler:\n"
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11383,7 +11550,7 @@ msgstr ""
 "    �%s�\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11395,7 +11562,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den n�?"
 
-#: mail/mail-callbacks.c:146
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11403,7 +11570,7 @@ msgstr ""
 "Du m� konfigurere en identitet\n"
 "f�r du kan skrive e-post."
 
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11412,7 +11579,7 @@ msgstr ""
 "f�r du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:198
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11420,11 +11587,11 @@ msgstr ""
 "Du sender en melding i HMTL-format, men f�lgende mottakeres �nsker ikke � "
 "motta meldinger i HTML-format:\n"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11432,7 +11599,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:299
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11440,11 +11607,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til � skjule listens "
 "adresser vil denne meldingen kun inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11454,11 +11621,11 @@ msgstr ""
 "�Apparently-To�-header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:427
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Du m� spesifisere mottakere for � kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11466,28 +11633,28 @@ msgstr ""
 "Kunne ikke �pne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-callbacks.c:1052
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:1056
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1535 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1537 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:2191
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker p� at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:2216
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11495,7 +11662,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:2255
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11503,32 +11670,32 @@ msgstr ""
 "Du kan kun sende meldinger p� nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:2269
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker p� at du vil sende alle %d meldingene p� nytt?"
 
-#: mail/mail-callbacks.c:2295
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:2340 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:2394
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:2396
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2467
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "G� til neste mappe med uleste meldinger?"
 
-#: mail/mail-callbacks.c:2474
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11536,7 +11703,7 @@ msgstr ""
 "Ingen flere nye meldinger i denne mappen.\n"
 "Vil du g� til neste mappe?"
 
-#: mail/mail-callbacks.c:2717
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11548,7 +11715,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:2830
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11557,28 +11724,28 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2842
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:2939
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:2966
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-letter"
 
-#: mail/mail-callbacks.c:3005
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:3193 mail/mail-callbacks.c:3234
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker p� at du vil �pne alle %d meldingene i separate vinduer?"
@@ -11600,7 +11767,7 @@ msgstr " [skript]"
 msgid "Please specify a valid script name"
 msgstr "Vennligst spesifiser et gyldig navn p� skriptet"
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2823
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -11621,7 +11788,10 @@ msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr "Vennligst skriv inn navn og e-post adresse under. De �valgfrie� feltene under m� ikke n�dvendigvis fylles ut, hvis du ikke �nsker � inkludere denne informasjonen i meldingene du sender."
+msgstr ""
+"Vennligst skriv inn navn og e-post adresse under. De �valgfrie� feltene "
+"under m� ikke n�dvendigvis fylles ut, hvis du ikke �nsker � inkludere denne "
+"informasjonen i meldingene du sender."
 
 #: mail/mail-config-druid.c:148
 msgid ""
@@ -11629,7 +11799,8 @@ msgid ""
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Vennligst skriv inn informasjon om din tjener for innkommende e-post under.\n"
-"Hvis du ikke er sikker, kontakt din systemadministrator eller Internett tjenestetilbyder."
+"Hvis du ikke er sikker, kontakt din systemadministrator eller Internett "
+"tjenestetilbyder."
 
 #: mail/mail-config-druid.c:150
 msgid "Please select among the following options"
@@ -11639,7 +11810,9 @@ msgstr "Vennligst velg mellom f�lgende alternativer"
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr "Vennligst skriv inn informasjon om m�ten du sender e-post. Hvis du ikke er sikker, kontakt din systemadministrator eller din Internett tjenestetilbyder."
+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:154
 msgid ""
@@ -11648,23 +11821,28 @@ msgid ""
 "will be grouped together to make an Evolution mail account. Please enter a "
 "name for this account in the space below. This name will be used for display "
 "purposes only."
-msgstr "Du er nesten ferdig med konfigurasjonsprosessen. Verdiene for identitet, innkommende e-post-tjener og metode for utg�ende e-post-transport du har oppgitt vil grupperes sammen til en Evolution e-post-konto. Vennligst oppgi et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for visning p� skjermen."
+msgstr ""
+"Du er nesten ferdig med konfigurasjonsprosessen. Verdiene for identitet, "
+"innkommende e-post-tjener og metode for utg�ende e-post-transport du har "
+"oppgitt vil grupperes sammen til en Evolution e-post-konto. Vennligst oppgi "
+"et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
+"visning p� skjermen."
 
 #. set window title
 #: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.c:617
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Konto %d"
 
-#: mail/mail-config.c:2543
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:2621 mail/mail-config.c:2625
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -11992,101 +12170,106 @@ msgstr "Husk dette _passordet"
 msgid "Required Information"
 msgstr "N�dvendig informasjon"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Gjenopp_rett forvalg"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr "Sikk_erhet"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 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:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 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:106
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr "Velg PGP-program"
 
-#: mail/mail-config.glade.h:107 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Utg�ende e-post"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Shortcuts _type:"
 msgstr "Snarvei_type:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr "Signatur #1"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr "Signatur #2"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr "Spr�k for stavekontroll"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr "Stave_kontroll"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 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:124
+#: mail/mail-config.glade.h:125
 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:126
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12094,11 +12277,11 @@ msgstr ""
 "Skriv navnet du vil referere til denne kontoen.\n"
 "For eksempel �Arbeid� eller �Personlig�"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12108,175 +12291,175 @@ msgstr ""
 "\n"
 "Klikk �Neste� for � begynne. "
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:138
 msgid "_Add Signature"
 msgstr "_Legg til signatur"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Alltid last bilder fra nettet"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 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:140
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Autentiseringstype: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Sjekk etter meldinger _automatisk"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr "Sett inn emotikoner _automatisk"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr "_Pip n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr "_Bekreft ved t�mming av mappe"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 msgid "_Default signature:"
 msgstr "_Forvalgt signatur:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 msgid "_Defaults"
 msgstr "_Forvalg"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ikke gi beskjed n�r nye meldinger ankommer"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:153
 msgid "_Enable"
 msgstr "_Aktiver"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr "_Fast bredde:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Forward style:"
 msgstr "_Videresendingsstil:"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Fullt navn:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr "_HTML e-post"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr "_Identitet"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Last bilder hvis avsender er i adresseboken"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "_Bruk denne som forvalgt konto"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "_Merk meldinger som lest etter"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Aldri last bilder fra _nettet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Sti til _PGP-bin�rfil:"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:168
 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:169
 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:170
 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:171
 msgid "_Receiving Mail"
 msgstr "_Mottak av e-post"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:174 ui/evolution-message-composer.xml.h:48
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr "Ut_sending av e-post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilder"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr "Br_uk sikker forbindelse (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr "_Variabel bredde:"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "hv_er(t)"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12300,197 +12483,207 @@ msgstr "Kunne ikke opprette S/MIME �envelope�-kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:345
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke opprette midlertidig fil �%s�: %s"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:430
 msgid "Save Attachment..."
 msgstr "Lagre vedlegg..."
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Vis �inline�"
 
-#: mail/mail-display.c:393
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "�pne i %s..."
 
-#: mail/mail-display.c:453
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis �inline� (via %s)"
 
-#: mail/mail-display.c:457
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:478
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Laster bilder"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1545
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr "Utg�tt:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "�pne lenke i nettleser"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "Postprogram"
 
-#: mail/mail-format.c:1737
-msgid "View messages..."
-msgstr "Vis meldinger..."
-
-#: mail/mail-format.c:1834
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk l�sikonet for mer informasjon."
 
-#: mail/mail-format.c:1861
+#: mail/mail-format.c:1835
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke opprette PGP verifiseringskontekst"
 
-#: mail/mail-format.c:1870
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1878
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:2128
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2142
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig p� nettsted �%s�"
 
-#: mail/mail-format.c:2147
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2184
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data (�%s�-type)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper/%s"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne �pne denne mappen igjen: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke lagre metainformasjon om mappe p�: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe �%s� til �%s�-format"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s kan kanskje ikke konfigureres p� nytt fordi det ikke er en lokal mappe"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12498,16 +12691,16 @@ msgstr ""
 "Hvis du ikke kan �pne denne postboksen igjen m�\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke endre format p� en ikke-lokal mappe."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s p� nytt"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12516,7 +12709,7 @@ msgstr ""
 "Feil under �%s�:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12525,7 +12718,7 @@ msgstr ""
 "Feil under utf�ring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Arbeider"
 
@@ -12533,100 +12726,100 @@ msgstr "Arbeider"
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:546 mail/mail-ops.c:575
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Likevel, fullf�rte sending av meldingen."
 
-#: mail/mail-ops.c:611
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender �%s�"
 
-#: mail/mail-ops.c:731
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:750
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet p� melding %d av %d"
 
-#: mail/mail-ops.c:752 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Fullf�rt."
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i �%s�"
 
-#: mail/mail-ops.c:1217
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�pner mappe %s"
 
-#: mail/mail-ops.c:1332
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "�pner lager %s"
 
-#: mail/mail-ops.c:1405
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe �%s�"
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1586
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "T�mmer mappe"
 
-#: mail/mail-ops.c:1635
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1707
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1905
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12635,7 +12828,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1933
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12644,11 +12837,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2007
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12657,26 +12850,21 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2054
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2202
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2202
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s p� nytt"
 
-#: mail/mail-ops.c:2290
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Kj�rer skall-kommando: %s"
-
 #: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_S�k"
@@ -12752,12 +12940,21 @@ msgstr "Venter..."
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-session.c:322
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "Husk dette passo_rdet"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Husk dette passordet for resten av denne sesjonen"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:325
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
@@ -12784,7 +12981,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr "Skriv navnet du vil referere til denne signaturen med."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Navn:"
 
@@ -12839,8 +13036,7 @@ msgstr ""
 "    �%s�\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFoldere"
 
@@ -12870,63 +13066,67 @@ msgstr "(Uten emne)"
 msgid "%s - Message"
 msgstr "%s - Melding"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:725
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:726
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:730
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:731
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:735
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "H�yere"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "H�yest"
 
-#: mail/message-list.c:1069
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1076
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1085
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "I g�r %l:%M %p"
 
-#: mail/message-list.c:1097
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1107
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2539
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -12958,43 +13158,43 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "St�rrelse"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "F�lg opp"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Ingen respons n�dvendig"
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 msgid "Review"
 msgstr "Gjennomg�"
 
-#: mail/message-tag-followup.c:319
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr "Merk for oppf�lging"
 
@@ -13018,16 +13218,16 @@ msgstr "Abonnerer p� mappe �%s�"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement p� mappe �%s�"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1516
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1577
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
@@ -17485,11 +17685,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro flyplass"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -22904,8 +23106,8 @@ msgstr "Ingen beskrivelse"
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:412
-#: my-evolution/e-summary-mail.c:740 shell/e-local-storage.c:1102
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
@@ -22923,15 +23125,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
@@ -22943,24 +23145,24 @@ msgstr "Feil under nedlasting av RDF"
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Alle"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Legg til"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Vist"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Ingen oppgaver"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
@@ -24231,7 +24433,8 @@ msgid "Tasks "
 msgstr "Oppgaver "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Innstillinger for v�r"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24296,11 +24499,6 @@ msgstr ""
 "Kan ikke overf�re mappe:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:113
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "�%s��i �%s�"
-
 #: shell/e-folder-list.c:312
 msgid "Add a Folder"
 msgstr "Legg til en mappe"
@@ -24310,7 +24508,7 @@ msgid "Drafts"
 msgstr "Skisser"
 
 #: shell/e-local-storage.c:179 shell/e-shell-view.c:397
-#: shell/e-shortcuts.c:1061
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Innboks"
 
@@ -24549,8 +24747,9 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Lag ny mappe"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Opprett _ny mappe..."
 
 #: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
@@ -24753,8 +24952,14 @@ msgstr "�pner mappe �%s�"
 msgid "in \"%s\" ..."
 msgstr "i �%s� ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
-msgid "Cannot find open the specified shared folder."
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kunne ikke endre navn p� mappe: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
+#, fuzzy
+msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke finne spesifisert delt mappe."
 
 #: shell/e-shell-startup-wizard.c:159
@@ -24770,8 +24975,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunne ikke starte assistent-grensesnittet for Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -24812,8 +25017,9 @@ msgstr "G� til mappe..."
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du �nsker � �pne"
 
-#: shell/e-shell-view-menu.c:595 ui/evolution.xml.h:11
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Opprett en ny snarvei"
 
 #: shell/e-shell-view-menu.c:596
@@ -24824,7 +25030,7 @@ msgstr "Velg mappen du �nsker snarveien skal peke til:"
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:62
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
@@ -24935,87 +25141,97 @@ msgstr "Endre navn p� snarveigruppen"
 msgid "Rename selected shortcut group to:"
 msgstr "Endre valgt snarveigruppe til:"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Sm� ikoner"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som sm� ikoner"
 
-#: shell/e-shortcuts-view.c:231
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "E_ndre navn p� denne gruppen..."
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Endre navn p� denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:255
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:375
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Opprett en ny snarvei"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Opprett en ny snarvei"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Endre navn p� snarvei"
 
-#: shell/e-shortcuts-view.c:376
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Endre navn p� valgt snarvei til:"
 
-#: shell/e-shortcuts-view.c:389
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "�pne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:391 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "�pne i nytt _vindu"
 
-#: shell/e-shortcuts-view.c:391
+#: shell/e-shortcuts-view.c:410
 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:394
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Endre navn p� denne snarveien"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:396
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
@@ -25023,7 +25239,7 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1053
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Snarveier"
 
@@ -25134,63 +25350,63 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Har allerede en eier"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Ingen eier"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Ust�ttet type"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Ust�ttet schema"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Ust�ttet operasjon"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Ingen plass igjen"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Gammel eier er d�d"
 
@@ -25486,119 +25702,107 @@ msgstr "Kopier utvalget"
 msgid "Copy to Folder..."
 msgstr "Kopier til mappe..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Opprett en ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Opprett en ny kontaktliste"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Slett valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Flytt kontakt(er) til en annen mappe..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Forh�ndsviser kontaktene som skal skrives ut"
 
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
 #: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
 #: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "Forh�ndsvisning av utskrift"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut valgte kontakter"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Lagre valgte kontakter som et VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Velg alle"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Velg alle kontakter"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Send en melding til valgte kontakter."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Send melding til kontakt"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Send valgte kontakter til en annen person."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Vis aktiv kontakt"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "H_andlinger"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktliste"
-
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Videresend kontakt..."
 
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Lagre _som VCard"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_S�k etter kontakter"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Velg alle"
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "_Send melding til kontakt..."
 
@@ -25853,34 +26057,30 @@ msgid "Post New Message"
 msgstr "Post ny melding"
 
 #: ui/evolution-mail-global.xml.h:12
-msgid "Post a Message"
-msgstr "Post en melding"
-
-#: ui/evolution-mail-global.xml.h:13
 msgid "Post a message to a Public folder"
 msgstr "Post en melding til en ny offentlig mappe"
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Vis vindu for forh�ndsvisning av melding"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Abonner eller fjern abonnement p� mapper p� eksterne tjenere"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "R_edigering av virtuelle mapper..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:20
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Forh�ndsvisningsvindu"
 
-#: ui/evolution-mail-global.xml.h:21
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Abonnerer p� mapper..."
 
@@ -26381,7 +26581,7 @@ msgstr "_Sitert"
 msgid "_Resend..."
 msgstr "S_end p� nytt..."
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:60
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "Ve_rkt�y"
 
@@ -26401,7 +26601,7 @@ msgid "_Close"
 msgstr "L_ukk"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:61
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vis"
 
@@ -26572,7 +26772,7 @@ msgstr "H_TML"
 msgid "Save the current file and close the window"
 msgstr "Lagre aktiv fil og lukk vinduet"
 
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:50
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -26696,6 +26896,10 @@ msgstr "Lag en lenke til denne mappen p� snarveilinjen"
 msgid "Create a new folder"
 msgstr "Opprett en ny mappe"
 
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Opprett en ny snarvei"
+
 #: ui/evolution.xml.h:12
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
@@ -26813,45 +27017,51 @@ msgid "_Folder Bar"
 msgstr "Ma_ppelinje"
 
 #: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "M_appe"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_G� til mappe..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Flytt..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:54
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Ny mappe"
 
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 msgid "_Preferences..."
 msgstr "_Brukervalg..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution.xml.h:58
-msgid "_Shortcut"
-msgstr "_Snarvei"
-
 #: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Snarveilinje"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Snarvei"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut sammendrag"
@@ -27082,7 +27292,7 @@ msgstr "..."
 msgid "Search Editor"
 msgstr "Redigering av s�k"
 
-#: widgets/misc/e-filter-bar.c:204
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Lagre s�k"
 
@@ -27145,18 +27355,58 @@ msgstr "Personlig adressebok-tjener"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebok-tjener; factory"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunne ikke initiere GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Utsteder: %s\n"
+#~ "Emne: %s"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Du har valgt en ugyldig dato."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Meldingens dato vil bli sammenlignet med tiden\n"
+#~ "n�r filteret kj�res eller tiden n�r vfolderen\n"
+#~ "�pnes."
+
+#~ msgid "View messages..."
+#~ msgstr "Vis meldinger..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Kj�rer skall-kommando: %s"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "�%s��i �%s�"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Lag ny mappe"
+
+#~ msgid "Create new contact"
+#~ msgstr "Opprett en ny kontakt"
+
+#~ msgid "Create new contact list"
+#~ msgstr "Opprett en ny kontaktliste"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktliste"
+
 #~ msgid "Welcome response error: %s: possibly non-fatal"
 #~ msgstr "Feil ved Welcome-svar: %s: mulig ikke-fatal"
 
@@ -27506,9 +27756,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Same as text"
 #~ msgstr "Samme som tekst"
 
-#~ msgid "Select a signature file"
-#~ msgstr "Velg en signaturfil"
-
 #~ msgid "Select a signature script"
 #~ msgstr "Velg et signaturskript"
 
@@ -27927,9 +28174,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "_Randomize"
 #~ msgstr "_Tilfeldiggj�r"
 
-#~ msgid "_Remember this password"
-#~ msgstr "Husk dette passo_rdet"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Send meldinger i HTML-format som standard."
 
diff --git a/po/pl.po b/po/pl.po
index 12060a737f..2fc369c6ad 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-11-13 07:43+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "Importuje pliki VCard do Evolution."
 msgid "File As"
 msgstr "Nazwa karty"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nazwa"
@@ -346,46 +346,46 @@ msgstr "Plik VCard z pozycj� %s"
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo�na zainicjowa� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "B��d w wyra�eniu wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Dodawanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Usuwanie karty z serwera LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modyfikowanie karty na serwerze LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Ponowne rozpoczynanie wyszukiwania."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Pobieranie wynik�w wyszukiwania na LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
@@ -480,11 +480,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -500,23 +500,32 @@ msgstr "Serwer LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Serwer LDAP zawieraj�cy informacje o kontaktach"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nowy kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Tworzy nowy kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nowa lista kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista _kontakt�w"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nowy kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Tworzy now� list� kontakt�w"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -539,30 +548,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Ta kopia Evolution nie obs�uguje SSL-a)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie mo�na zainicjowa� gnome-vfs"
 
@@ -570,11 +579,11 @@ msgstr "Nie mo�na zainicjowa� gnome-vfs"
 msgid "Other Contacts"
 msgstr "Inne kontakty"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nie mo�na otworzy� ksi��ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -583,7 +592,7 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Mo�e to by� spowodowane\n"
 "wprowadzeniem niepoprawnego URI lub niedost�pno�ci� serwera LDAP."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -594,7 +603,7 @@ msgstr ""
 "Aby m�c wykorzysta� LDAP, nale�y pobra� OpenLDAP spod podanego\n"
 "poni�ej adresu i ponownie skompilowa� Evolution ze �r�de�.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,44 +611,44 @@ msgstr ""
 "Nie mo�na otworzy� tej ksi��ki adresowej. Upewnij si�, �e �cie�ka\n"
 "ustnieje oraz �e ma ustawione odpowiednie uprawnienia."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Wprowad� has�o dla %s (u�ytkownik %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "ko�czy si� na"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori� jest"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI kt�re ma wy�wietli� przegl�darka katalog�w"
 
@@ -761,7 +770,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "�r�d�a ksi��ki adresowej"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -857,8 +866,8 @@ msgstr "Konfiguracja"
 msgid "Mappings"
 msgstr "Marginesy"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_co"
@@ -910,8 +919,8 @@ msgstr "_Zakres wyszukiwania:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
@@ -1102,15 +1111,15 @@ msgid "Using email address"
 msgstr "_To jest adres pocztowy"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -1156,12 +1165,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edycja"
@@ -1276,10 +1285,10 @@ msgstr "Generator interfejsu wyboru nazwy ksi��ki adresowej Evolution"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Usu�"
 
@@ -1308,43 +1317,15 @@ msgstr "(%d niewy�wietlonych)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Nadawca zawiera"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Nie mo�na uzyska� lokalnego miejsca przechowywania ksi��ki adresowej.\n"
-"Mo�e to by� spowodowane nieprawid�owym dzia�aniem komponentuevolution-"
-"addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu tego\n"
-"problemu, wy�lij e-mail (w j�zyku angielskim) do Jona Trowbridge'a\n"
-"<trow@ximian.com>, szczeg�owo opisuj�c warunki, w jakich pojawi� si�\n"
-"problem. Dzi�kujemy."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Nie mo�na uzyska� dost�pu do lokalnego miejsca przechowywania\n"
-"ksi��ki adresowej, co nie powinno si� normalnie zdarzy�.\n"
-"Aby naprawi� ten problem, konieczne mo�e by� zako�czenie, a\n"
-"nast�pnie ponowne uruchomienie Evolution."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Wyb�r kontakt�w z ksi��ki adresowej"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Wyb�r nazw"
@@ -1366,15 +1347,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Przenie�..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Folder:"
 
@@ -1489,11 +1465,12 @@ msgstr "Chce otrzymywa� listy w HTML-u"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Usu�"
 
@@ -2736,7 +2713,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ukrywanie adres�w przy wysy�aniu do tej listy"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Usu�"
 
@@ -2800,7 +2777,7 @@ msgstr ""
 "Czy pomimo tego chcesz go doda�?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
@@ -2828,21 +2805,21 @@ msgid "Error getting book view"
 msgstr "B��d przy uruchamianiu %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "B��d przy modyfikacji karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Sukces"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Nieznany b��d"
 
@@ -2850,8 +2827,8 @@ msgstr "Nieznany b��d"
 msgid "Repository offline"
 msgstr "Repozytorium roz��czone"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Brak uprawnie�"
 
@@ -2868,7 +2845,7 @@ msgid "Protocol not supported"
 msgstr "Protok� nie jest obs�ugiwany"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2891,48 +2868,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Plik %s nie istnieje."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Inny b��d"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Czy chcesz zapisa� zmiany?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "B��d przy dodawaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "B��d przy dodawaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "B��d przy modyfikacji listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "B��d przy usuwaniu listy"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "B��d przy usuwaniu karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Wy�wietlanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Wy�wietlanie"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2940,22 +2922,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Brak kart"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Brak kart"
@@ -3028,7 +3010,7 @@ msgstr "Ksi��ka adresowa"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
@@ -3068,7 +3050,7 @@ msgid "Pilot Settings..."
 msgstr "_Ustawienia pilota..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prze�lij kontakt"
 
@@ -3077,8 +3059,8 @@ msgid "Send Message to Contact"
 msgstr "Wy�lij list do kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Wydrukuj"
@@ -3098,7 +3080,7 @@ msgid "Move to folder..."
 msgstr "P_rzenie� do folderu..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
@@ -3109,20 +3091,20 @@ msgid "Copy"
 msgstr "Skopiuj"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Usu�"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Bie��cy widok"
@@ -3293,7 +3275,7 @@ msgstr "Marginesy"
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Opcje"
 
@@ -3383,26 +3365,26 @@ msgstr "Termin pozbawiony nazwy"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Wysoki"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Zwyk�y"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Niski"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Niezdefiniowany"
@@ -3526,11 +3508,11 @@ msgstr "Czas u�pienia (minuty)"
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3542,13 +3524,13 @@ 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:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Ostrze�enie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3565,7 +3547,7 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomi� ten program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o to w przysz�o�ci."
@@ -3594,7 +3576,7 @@ msgstr "Opis zawiera"
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
@@ -3605,7 +3587,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3627,18 +3609,18 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie mo�na stworzy� widoku kalendarza.  Zweryfikuj ustawienia ORBita i OAF-a."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajny"
@@ -3663,37 +3645,37 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Wolny"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Zaj�ty"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Przed rozpocz�ciem"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Trwaj�ce"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Zako�czone"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3704,56 +3686,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Powtarzanie"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Przyporz�dkowany"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Tak"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Widok dnia"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Widok tygodnia roboczego"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Widok tygodnia"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Widok miesi�ca"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -3761,12 +3742,12 @@ msgstr "Kalendarz"
 msgid "Folder containing appointments and events"
 msgstr "Folder zawieraj�cy terminy i zdarzenia"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -3774,44 +3755,62 @@ msgstr "Zadania"
 msgid "Folder containing to-do items"
 msgstr "Folder zawieraj�cy pozycje do wykonania"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Nowy termin"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Termin"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Tworzy nowy termin"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Ustawienia �r�de� nowo�ci"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Tworzy nowe zadanie"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Tworzy nowe zadanie"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Nowy termin"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Termin"
+msgid "Create a new all-day appointment"
+msgstr "Tworzy nowy termin"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3878,7 +3877,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dni"
 
@@ -3886,11 +3886,13 @@ msgstr "dni"
 msgid "extra times every"
 msgstr "dodatkowych razy co"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut"
 
@@ -4018,7 +4020,7 @@ msgstr "Przypominanie"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
@@ -4047,7 +4049,7 @@ msgstr "koniec terminu"
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4225,7 +4227,7 @@ msgid "_Fri"
 msgstr "_Pi�"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "Og�_lne"
 
@@ -4271,19 +4273,33 @@ msgstr "�_ro"
 msgid "before every appointment"
 msgstr "przed pocz�tkiem terminu"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Termin spotkania zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to spotkanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� to zadanie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Czy na pewno chcesz anulowa� i usun�� ten wpis dziennika?"
 
@@ -4351,61 +4367,61 @@ msgstr " (Nale�ne "
 msgid "Due "
 msgstr "Nale�ne "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nie mo�na uaktualni� obiektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nie mo�na uaktualni� obiektu!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nie mo�na uzyska� bie��cej wersji!"
 
@@ -4607,7 +4623,7 @@ msgid "Member"
 msgstr "Cz�onek"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4619,7 +4635,7 @@ msgstr "Rola"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stan"
@@ -4705,7 +4721,7 @@ msgstr "w"
 msgid "first"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunda"
 
@@ -4729,7 +4745,7 @@ msgstr "lista"
 msgid "Other Date"
 msgstr "Inny faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dzie�"
 
@@ -4829,20 +4845,26 @@ msgstr "% zako�czenia"
 msgid "Date Completed:"
 msgstr "Data zako�czenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Wymaga dzia�ania"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Post�p"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "P_riorytet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stan:"
 
@@ -4856,7 +4878,7 @@ msgstr "Proste"
 msgid "Assignment"
 msgstr "Przyporz�dkowanie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4925,80 +4947,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otw�rz"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Wy_drukuj..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "S_kopiuj"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Przypisz zadanie"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Prze�lij jako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Oznacz jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zako�czone"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Usu� zaznaczone zadania"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Aktualizowanie obiekt�w"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknij, aby doda� zadanie"
@@ -5007,8 +5029,8 @@ msgstr "Kliknij, aby doda� zadanie"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Zako�czone"
 
@@ -5036,11 +5058,9 @@ msgstr "Priorytet"
 msgid "Start Date"
 msgstr "Data rozpocz�cia"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Zestawienie"
 
@@ -5082,110 +5102,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nowy _termin"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _ca�odniowe"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Wydrukuj..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Przejd� do d_zisiaj"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Przejd� do daty..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informacj� o zaj�to�ci"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Konfiguracja"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Konfiguracja"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Zapisz j_ako..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Zaplanuj spotkanie"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Prze�lij jako i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Przekszta�� to wyst�pienie w p_rzesuwalne"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Usu� to _wyst�pienie"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Usu� w_szystkie wyst�pienia"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "B��d przy wykonywaniu %s."
@@ -5226,7 +5245,7 @@ msgstr "Zadanie uko�czone: <b>"
 msgid "Task Due: <b>"
 msgstr "Zadanie na: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
@@ -5235,12 +5254,12 @@ msgstr "Informacje iKalendarza"
 msgid "iCalendar Error"
 msgstr "B��d iKalendarza"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5248,325 +5267,332 @@ msgstr ""
 "<br> Przejrzyj wy�wietlone informacje, a nast�pnie wybierz czynno�� z "
 "poni�szego menu."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Po�o�enie geograficzne: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Wyb�r czynno�ci:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Pr�bna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Wys�anie informacji o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Wys�anie naj�wie�szej informacji"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zwraca si� o twoj� obecno�� na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> chce dodania do istniej�cego spotkania."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzyma� naj�wie�sze informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� spotkania"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Odpowied� na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulowa� spotkanie."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wys�a� niezrozumia�� wiadomo��."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomo�� o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> opublikowa� informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zwraca si� o wykonanie przez ciebie zadania."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> chce dodania do istniej�cego zadania."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzyma�  naj�wie�sze informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Zwr�cenie si� o aktualizacj� zadania"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpowiedzia� na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Odpowied� na zadanie"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulowa� zadanie."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomo�� o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> opublikowa� informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zwraca si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Zwr�cenie si� o informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpowiedzia� na zwr�cenie si� o informacj� o zaj�to�ci."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Odpowied� z informacj� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomo�� o zaj�to�ci"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobs�ugiwane ��dania."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Za��cznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Za��cznik nie zawiera daj�cych si� wy�wietli� element�w kalendarza"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Aktualizacja zako�czona\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Nie mo�na uaktualni� pliku kalendarza!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� element ju� nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie mo�na uaktualni� stanu uczestnika, poniewa� jest on nieprawid�owy!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika zosta� uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie mo�na uaktualni� stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Usuni�cie zako�czone"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Element zosta� wys�any!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Nie mo�na wys�a� elementu!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Wyb�r folderu"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Wyb�r folderu"
@@ -5612,7 +5638,7 @@ msgstr "data-ko�cowa"
 msgid "Chair Persons"
 msgstr "Osoby przewodnicz�ce"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
@@ -5625,57 +5651,52 @@ msgid "Non-Participants"
 msgstr "Nie uczestnicy"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Osoba"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupa"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Zas�b"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Pomieszczenie"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Przewodniczenie"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Wymaga dzia�ania"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Pr�bnie zaakceptowane"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Oddelegowane"
 
@@ -5765,49 +5786,46 @@ msgstr "Czas p_ocz�tku spotkania:"
 msgid "Meeting _end time:"
 msgstr "Czas _ko�ca spotkania:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zada� z %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nie mo�na wczyta� zadania w \"%s\""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda wymagana do odczytu \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nie mo�na otworzy� folderu w \"%s\""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data zako�czenia"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiekt�w"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Oczyszczanie folderu"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Usu� termin"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5818,11 +5836,16 @@ msgstr "Nie mo�na otworzy� folderu w \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda wymagana do otwarcia \"%s\" nie jest obs�ugiwana"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otwieranie kalendarza z %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Otwieranie folderu %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Kwiecie�"
@@ -5879,59 +5902,64 @@ msgstr "Pa�dziernik"
 msgid "September"
 msgstr "Wrzesie�"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 #, fuzzy
 msgid "At least one attendee is necessary"
 msgstr "Wymagany jest co najmniej jeden uczestnik"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Nale�y poda� organizatora."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "informacje kalendarza"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Informacje opcjonalne"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informacja o zaj�to�ci"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "informacje kalendarza"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Aktualizacja"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Od�wie� list�"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Musisz nale�e� do uczestnik�w zdarzenia."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Nie mo�na zainicjowa� Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Nie mo�na stworzy� generatora komponentu edytora"
 
@@ -6159,9 +6187,8 @@ msgid "Print Calendar"
 msgstr "Wydrukuj kalendarz"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
@@ -6197,8 +6224,8 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przysz�o�ci."
 
@@ -6264,17 +6291,29 @@ msgstr "Importuje pliki VCard do Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje pliki VCard do Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nie mo�na pobra� listu: %s z folderu %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Przypominanie"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Komunikat kalendarza"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6283,93 +6322,93 @@ msgstr ""
 "Odnaleziono pliki pocztowe programu Pine.\n"
 "Czy chcesz zaimportowa� je do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalendarz"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "time-now wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "make-time wymaga, aby 1. argument by� napisem z dat�/czasem w formacie ISO "
 "8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 "time-add-day wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day wymaga, aby 2. argument by� liczb� ca�kowit�"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 "time-day-begin wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 "time-day-end wymaga, aby 1. argument by� liczb� okre�laj�c� czas (time_t)"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 "occur-in-time-range? wymaga, aby 2. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? wymaga 2 argument�w"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? wymaga, �eby 1. argument by� napisem"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? wymaga, �eby 2. argument by� napisem"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6377,11 +6416,11 @@ msgstr ""
 "contains? wymaga, �eby 1. argument mia� jedn� z warto�ci: \"any\", \"summary"
 "\", \"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? wymaga co najmniej 1 argumentu"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6389,21 +6428,21 @@ msgstr ""
 "has-categories? wymaga, �eby wszystkie argumenty by�y napisami, lub �eby "
 "podany by� dok�adnie jeden argument, b�d�cy fa�szem logicznym (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? wymaga 0 argument�w"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? wymaga 1 argumentu"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 "completed-before? wymaga, aby 1. argument by� liczb� okre�laj�c� czas "
 "(time_t)"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Przetworzenie wyra�enia wyszukiwania nie da�o warto�ci logicznej"
 
@@ -8104,72 +8143,82 @@ msgstr "Zapisywanie folderu \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr "Do zako�czenia tej operacji konieczne jest po��czenie z sieci�"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synchronizowanie folder�w"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "B��d przy analizie sk�adni filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "B��d przy wykonywaniu filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Nie mo�na otworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nie mo�na przetworzy� folderu kolejki"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Pobieranie %d. listu (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Niepowodzenie przy %d. li�cie"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synchronizowanie folderu"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Niepowodzenie przy li�cie %d z %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Niepoprawny argumenty"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Niepoprawny argumenty"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "B��d przy wykonywaniu wyszukiwania przez filtr: %s: %s"
@@ -8225,7 +8274,7 @@ msgstr "Przenoszenie list�w"
 msgid "Copying messages"
 msgstr "Kopiowanie list�w do %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8233,47 +8282,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowied� od serwera POP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Nie podano nazwy pliku."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie mo�na zaszyfrowa� listu: nie podano odbiorc�w"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8281,18 +8330,18 @@ msgid ""
 "%.*s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nie mo�na odkodowa� listu."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8320,24 +8369,24 @@ msgid "Could not lock '%s'"
 msgstr "Nie mo�na zablokowa� \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie mo�na stworzy� pliku blokady dla %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Up�yn�� czas przeznaczony na uzyskanie blokady pliku %s. Spr�buj ponownie "
 "p�niej."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Uzyskanie blokady za pomoc� fcntl(2) nie powiod�o si�: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomoc� flock(2) nie powiod�o si�: %s"
@@ -8396,11 +8445,15 @@ msgstr "B��d przy zapisie do tymczasowego pliku z listami: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "B��d przy kopiowaniu tymczasowego pliku z listami: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8538,7 +8591,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
@@ -8725,33 +8778,134 @@ msgstr ""
 "Nie mo�na stworzy� folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Nie mo�na zweryfikowa� certyfikatu."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Wydawca: %s\n"
-"Temat: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Nie mo�na zweryfikowa� certyfikatu."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Niepoprawny certyfikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Czy pomimo tego chcesz go zaakceptowa�?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Plik z podpisem:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID _certyfikatu:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "B��d odczycie %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Poza biurem"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nie mo�na zweryfikowa� certyfikatu."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID _certyfikatu:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Niepoprawny argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID _certyfikatu:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID _certyfikatu:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8760,16 +8914,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Niepoprawny certyfikat od %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Czy pomimo tego chcesz go zaakceptowa�?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8789,32 +8960,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie mo�na rozpozna� URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "B��d przy uruchamianiu %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie mo�na usun�� folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
@@ -8822,12 +8998,12 @@ msgstr "Nie mo�na zmieni� nazwy folderu %s: Folder nie istnieje"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwa� po��czenie: %s"
@@ -8856,40 +9032,40 @@ msgstr "Odpowied� serwera IMAP nie zawiera informacji %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied� OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo�na stworzy� katalogu %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nie mo�na wczyta� zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze zosta� usuni�ty stworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedost�pny"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowuj�cych nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 
@@ -8898,10 +9074,10 @@ msgstr "Nie mo�na odnale�� tre�ci listu w odpowiedzi na FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nie mo�na otworzy� katalogu cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nie mo�na zapisa� listu %s w cache: %s"
@@ -8914,7 +9090,7 @@ msgstr "Sprawdzanie nowej poczty"
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Foldery"
 
@@ -8945,7 +9121,7 @@ msgstr "Do przegl�dania i przechowywania poczty na serwerach IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Has�o"
 
@@ -8955,73 +9131,77 @@ msgstr ""
 "Przy tej opcji po��czenie z serwerem IMAP nast�pi przy u�yciu has�a w "
 "postaci czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "us�uga %s dla %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Anulowano po��czenie"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Nieobs�ugiwana operacja"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Uwierzytelnienie nie powiod�o si�."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Folder nie jest pusty"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obs�ugi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono has�a."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9032,31 +9212,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Nazwa folderu nie mo�e zawiera� znaku ko�ca wiersza."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrz�dny nie mo�e zawiera� folder�w podrz�dnych"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nie mo�na otworzy� skrzynki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9078,7 +9264,10 @@ msgid "Local delivery"
 msgstr "Dostarczanie lokalne"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 "Do pobierania lokalnej poczty ze standardowych kolejek w formacie mbox."
 
@@ -9107,14 +9296,14 @@ msgstr "Standardowe uniksowe kolejki mbox"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Do odczytu i przechowywania lokalnej poczty w standardowych plikach kolejek "
 "w formacie mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9127,38 +9316,38 @@ msgid "Store root %s is not a regular directory"
 msgstr ""
 "Lokalizacja nadrz�dna miejsca przechowywania %s nie jest zwyk�ym katalogiem"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nie mo�na pobra� folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne miejsca przechowywania nie maj� skrzynki nadchodz�cej"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nie mo�na usun�� pliku \"%s\" z indeksem folderu: %s"
@@ -9218,7 +9407,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9257,26 +9446,26 @@ msgstr "to nie katalog z listami w formacie maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie mo�na przeszuka� folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie mo�na otworzy� katalogu z listami ze scie�ki: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Sprawdzanie nowej poczty"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Wyszukiwanie nowych list�w"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Zapisywanie folderu"
@@ -9320,7 +9509,7 @@ msgstr "Folder jest uszkodzony w spos�b uniemo�liwiaj�cy napraw�."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Stworzenie listu nie powiod�o si�: Uszkodzona skrzynka?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9329,7 +9518,7 @@ msgstr ""
 "Nie mo�na otworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9338,14 +9527,14 @@ msgstr ""
 "Nie mo�na stworzy� pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwyk�ym plikiem."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9354,7 +9543,7 @@ msgstr ""
 "Nie mo�na usun�� folderu \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zosta� usuni�ty."
@@ -9369,64 +9558,64 @@ msgstr "Nie mo�na otworzy� folderu %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nie mo�na sprawdzi� folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nie mo�na otworzy� pliku %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo�na otworzy� tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo�na zamkn�� folderu tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Niezgodno�� folderu z zestawieniem, nawet po synchronizacji"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany b��d: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie mo�na zmieni� nazwy folderu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie powi�d� si� zapis do tymczasowej skrzynki: %s: %s"
@@ -9579,50 +9768,50 @@ msgstr "Anuluj"
 msgid "Operation failed: %s"
 msgstr "Operacja anulowana"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Pobieranie zestawienia POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Operacja anulowana"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nie mo�na pobra� folderu: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Oczyszczanie z usuni�tych list�w"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto�ci uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie %d. listu z serwera POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Nie mo�na pobra� listu: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Nieznane opady"
@@ -9640,7 +9829,7 @@ msgstr "Pozostawianie list�w na serwerze"
 msgid "Delete after %s day(s)"
 msgstr "Usuwanie po %s dniach"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9667,6 +9856,11 @@ msgstr ""
 "u�yciu protoko�u APOP. Mo�e on nie funkcjonowa� dla wszystkich u�ytkownik�w, "
 "nawet, je�li serwer teoretycznie obs�uguje protok�."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nie mo�na nawi�za� po��czenia z %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9678,54 +9872,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Nie mo�na nawi�za� po��czenia z serwerem POP pod adresem %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Brak obs�ugi wymaganego mechanizmu uwierzytelniania."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Nie powiod�o si� polecenie IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "B��d We/Wy"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPodaj has�o POP3 dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu has�a: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9753,36 +9949,36 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo�na stworzy� procesu dla programu sendmail: %s: nie wys�ano poczty"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie mo�na wys�a� listu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Program sendmail zosta� przerwany przez sygna� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie mo�na wykona� %s: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "Program sendmail zosta� zako�czony z kodem stanu %d: nie wys�ano poczty."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9893,45 +10089,45 @@ msgstr "Chwilowe niepowodzenie przy uwierzytelnianiu"
 msgid "Authentication required"
 msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "B��dna odpowied� na powitanie: %s: prawdopodobnie mo�na kontynuowa�"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nie mo�na nawi�za� po��czenia z serwerem POP.\n"
 "Wyst�pi� b��d przy wysy�aniu nazwy u�ytkownika: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Forma listu jest niepoprawna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Serwer SMTP %s nie obs�uguje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPodaj has�o SMTP dla %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9942,90 +10138,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serwer SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Wysy�anie list�w za pomoc� SMTP poprzez %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Wysy�anie listu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie mo�na wys�a� listu: nie podano odbiorc�w"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Powitanie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Up�yn�� czas oczekiwania po HELO: %s: mo�na kontynuowa�"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "B��dna odpowied� na HELO: %s: mo�na kontynuowa�"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Up�yn�� czas oczekiwania po RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Uwierzytelnianie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "B��d przy tworzeniu obiektu uwierzytelniaj�cego SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Nie powiod�o si� wykonanie AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "B��dna odpowied� na MAIL FROM: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po RCPT TO: %s: nie wys�ano poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
@@ -10033,92 +10229,92 @@ msgstr "Up�yn�� czas oczekiwania po DATA: %s: nie wys�ano poczty"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Up�yn�� czas oczekiwania na wys�anie DATA: przerwanie listu: %s: nie wys�ano "
 "poczty"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Niepoprawna odpowied� serwera na uwierzytelnienie."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Up�yn�� czas oczekiwania po RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Up�yn�� czas oczekiwania po QUIT: %s: mo�na kontynuowa�"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Up�yn�� czas oczekiwania po AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "B��dna odpowied� na RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajt�w"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "za��cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy za��cznik�w"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Dodaj za��cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Za��cza plik do listu"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie mo�na za��czy� pliku %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie mo�na za��czy� pliku %s: to nie jest zwyk�y plik"
@@ -10136,73 +10332,85 @@ msgid "MIME type:"
 msgstr "Typ MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wy�wietlenia za��cznika"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzy� ksi��k� adresow�"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Od:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Odpowied� do:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod kt�re zostanie przes�ana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
 "Podaj adresy, pod kt�re zostanie przes�ana kopia listu bez listy odbiorc�w."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "P_ort:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Za��czenie pliku"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nie mo�na stworzy� kontekstu podpisu PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10211,34 +10419,34 @@ msgstr ""
 "B��d przy odczycie pliku %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Ostrze�enie!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Plik istnieje, nadpisa�?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "B��d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "B��d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "B��d przy dost�pie do pliku: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nie mo�na pobra� listu z edytora"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10247,7 +10455,7 @@ msgstr ""
 "Nie mo�na zmieni� po�o�enia w pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10256,7 +10464,7 @@ msgstr ""
 "Nie mo�na przyci�� pliku: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10265,7 +10473,7 @@ msgstr ""
 "B��d przy automatycznym zapisie listu: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10273,7 +10481,7 @@ msgstr ""
 "Odnaleziono niezapisane pliki z poprzedniej sesji Evolution.\n"
 "Czy chcesz spr�bowa� je odzyska�?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10283,43 +10491,39 @@ msgstr ""
 "\n"
 "Czy chcesz zapisa� zmiany?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Otwarcie pliku"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Wstawienie pliku"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Zapisz podpis"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (domy�lne)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10327,7 +10531,7 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� formantu wyboru adresu."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10335,9 +10539,9 @@ msgstr ""
 "Nie mo�na otworzy� okna tworzenia listu:\n"
 "Nie mo�na uaktywni� komponentu edytora HTML-a."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10402,8 +10606,8 @@ msgstr "Temat zawiera"
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10411,12 +10615,11 @@ msgstr ""
 "Plik o tej nazwie ju� istnieje.\n"
 "Nadpisa� go?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Zapami�tanie has�a"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
 
@@ -10515,149 +10718,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "rok"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "lat"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekund"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "miesi�c"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuta"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "miesi�cy"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "godzina"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "tydzie�"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "tygodni"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "godzina"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "miesi�c"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuta"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "miesi�cy"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekund"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "rok"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "lat"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Nie zesta�a wybrana data."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Zosta�a wybrana niepoprawna data."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Data listu b�dzie por�wnywana z czasem\n"
-"zastosowania filtra."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Data listu b�dzie por�wnywana z czasem podanym\n"
-"poni�ej."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Data listu b�dzie por�wnywana z czasem podanym\n"
-"jako wzgl�dny do czasu zastosowania filtra, np.\n"
-"\"tydzie� temu\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "bie��cym czasem"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "podanym czasem"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "czasem podanym wzgl�dem bie��cego"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Wyb�r czasu odniesienia"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Por�wnanie z"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<kliknij, aby wybra� dat�>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " temu"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "temu"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %k:%M"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " temu"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<kliknij, aby wybra� dat�>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Wyb�r czasu odniesienia"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regu�y filtr�w"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nazwa stylu:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Kolejka \"%s\" nie istnieje lub nie jest zwyk�ym plikiem"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Wyb�r czynno�ci:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Podejmowane czynno�ci"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Dodaj czynno��"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10665,12 +10819,12 @@ msgstr ""
 "Nie zosta� wybrany folder.\n"
 "Wr�� i podaj folder, do kt�rego powinna by� dostarczona poczta."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Wyb�r folderu"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10679,92 +10833,167 @@ msgstr ""
 "B��d w wyra�eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Wa�ny"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Przetwarzanie"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Nale�y nada� temu filtrowi nazw�."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nazwa regu�y: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Lista warunk�w"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Wykonywanie czynno�ci"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "przy spe�nieniu wszystkich kryteri�w"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "przy spe�nieniu kt�regokolwiek z kryteri�w"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "nadchodz�ce"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "wychodz�ce"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Por�wnanie z"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Modyfikacja filtr�w"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolder�w"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Nadchodz�ce"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Wychodz�ce"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Data listu b�dzie por�wnywana z czasem podanym\n"
+"poni�ej."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Data listu b�dzie por�wnywana z czasem podanym\n"
+"jako wzgl�dny do czasu zastosowania filtra, np.\n"
+"\"tydzie� temu\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Data listu b�dzie por�wnywana z czasem podanym\n"
+"poni�ej."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "czasem podanym wzgl�dem bie��cego"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "temu"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "tylko okre�lone foldery"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "bie��cym czasem"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "podanym czasem"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "�r�d�a VFolder�w"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
@@ -10792,42 +11021,42 @@ msgid "Beep"
 msgstr "Belize"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Firma"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Skopiuj do folderu"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data wys�ania"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Usuni�ty"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nie ko�czy si� na"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nie istnieje"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "nie istnieje"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nie brzmi jak"
@@ -10849,92 +11078,88 @@ msgid "ends with"
 msgstr "ko�czy si� na"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Istnieje"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Wyra�enie"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Wa�ny"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "jest po"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "jest przed"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Oznaczony"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "jest wi�kszy ni�"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "jest mniejszy ni�"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Oznaczony"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista dyskusyjna"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Tre�� listu"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Nag��wek listu"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Przenie� do folderu"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Wy�lij list do kontaktu"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Odtwarzany d�wi�k:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Przeczytany"
 
@@ -10950,57 +11175,87 @@ msgstr "Dopasowanie wg regexp"
 msgid "Replied to"
 msgstr "Z odpowiedzi� do"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Prc"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "jest wi�kszy ni�"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "jest mniejszy ni�"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punkty"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ustaw stan"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Firma"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Rozmiar (KB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "brzmi jak"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Konto �r�d�owe"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Okre�lony nag��wek"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "rozpoczyna si� od"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Ustaw stan"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regu�y"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Dodaj regu��"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Zmodyfikuj regu��"
 
@@ -11008,11 +11263,11 @@ msgstr "Zmodyfikuj regu��"
 msgid "Score Rules"
 msgstr "Regu�y punktacji"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Nale�y nada� temu vFolderowi nazw�."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 
@@ -11020,31 +11275,31 @@ msgstr "Nale�y poda� jako �r�d�o przynajmniej jeden folder."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje star� poczt� Elma"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importowanie..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Poczekaj chwil�"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importowanie %s jako %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizowanie %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Poczta"
 
@@ -11105,39 +11360,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�mietnik"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokalny plik z listami %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Analizowanie katalogu"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Rozpoczynanie importowania"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Modyfikacja filtr�w"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11218,12 +11473,12 @@ msgstr "Generator komponentu zestawienia poczty."
 msgid "Font Preferences"
 msgstr "_Brak powtarzalno�ci"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Konta"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11271,7 +11526,7 @@ msgstr "W�a�ciwo�ci..."
 msgid "Change this folder's properties"
 msgstr "Zmienia w�a�ciwo�ci folderu"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11279,58 +11534,78 @@ msgstr ""
 "Wygl�da na to, �e cz�� twoich ustawie� poczty zosta�a uszkodzona. Upewnij "
 "si�, �e wszystko jest na miejscu."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Nie zosta� ustawiony spos�b przekazywania list�w"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Uwaga: Zmodyfikowany list"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "L_ist"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Tworzenie listu"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Kolejny list"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Poprzedni list"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nowy list"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo�na zainicjowa� komponentu pocztowego Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie mo�na zainicjowa� komponentu konfiguracji poczty Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nie mo�na zainicjowa� komponentu informacji o folderach Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Nie mo�na zarejstrowa� w pow�oce miejsca przechowywania"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "W�a�ciwo�ci \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "W�a�ciwo�ci"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo�na stworzy� katalogu tymczasowego: %s"
@@ -11380,135 +11655,135 @@ msgstr "og�em: %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Stw�rz _wirtualny folder na podstawie listu"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawc�"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorc�w"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _list� dyskusyjn�"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawc�"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorc�w"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_st� dyskusyjn�"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpowiedz na _list�"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Prze�lij"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Zako�czone"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Wyczy��"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako wa�ny"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Oz_nacz jako niewa�ny"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Cofnij usuni�cie"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawc� do ksi��ki adresowej"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "_Stw�rz regu�� na podstawie listu"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VFolder w oparciu o list� dyskusyjn�"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtr w oparciu o list� dyskusyjn� (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder w oparciu o list� dyskusyjn� (%s)"
@@ -11574,76 +11849,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Edytor nowin Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nazwa _u�ytkownika:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "�_cie�ka:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Nie mo�na stworzy� dw�ch kont o tej samej nazwie."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Czy na pewno chcesz usun�� to konto?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Rzeczywi�cie usun�� konto?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Unieaktywnij"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Czy na pewno chcesz usun�� to konto?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Aktywne"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nazwa _konta:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11653,30 +11919,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Dodanie regu�y filtra"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11688,7 +11954,7 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11701,7 +11967,7 @@ msgstr ""
 "jakichkolwiek list�w.\n"
 "Czy chcesz przeprowadzi� j� teraz?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11709,7 +11975,7 @@ msgstr ""
 "Przed wys�aniem listu nale�y skonfigurowa�\n"
 "wykorzystywan� to�samo��."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11718,7 +11984,7 @@ msgstr ""
 "spos�b przekazywania list�w."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11726,11 +11992,11 @@ msgstr ""
 "Zamierzasz wys�a� list zapisany w HTML-u, lecz wymienieni poni�ej odbiorcy "
 "�e nie chc� otrzymywa� list�w w tej postaci:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11738,7 +12004,7 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "Rzeczywi�cie wys�a�?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11747,11 +12013,11 @@ msgstr ""
 "ukrywa� adresy jej cz�onk�w, list zawiera� b�dzie tylko ukrytych adresat�w "
 "(bcc)."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Ten list zawiera tylko ukrytych adresat�w (bcc)"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11761,15 +12027,11 @@ msgstr ""
 "nag��wek Apparently-To.\n"
 "Czy pomimo tego wys�a�?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Przed wys�aniem listu nale�y poda� jego odbiorc�w."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Przed wys�aniem listu nale�y skonfigurowa� konto."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11777,28 +12039,28 @@ msgstr ""
 "Nie mo�na otworzy� folderu poczty roboczej, zwi�zanego z tym kontem.\n"
 "Czy chcesz zamiast tego wykorzysta� domy�lny folder Poczta robocza?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "W li�cie z %a, %d-%m-%Y, godz. %H:%M, %%s pisze: "
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Przeniesienie list�w do folderu"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiowanie list�w do folderu"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Czy na pewno chcesz zredagowa� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11806,7 +12068,7 @@ msgstr ""
 "Mo�liwe jest redagowanie wy��cznie\n"
 "list�w zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11814,39 +12076,39 @@ msgstr ""
 "Listy zapisane w folderze Wys�ane\n"
 "mo�na tylko wys�a� ponownie."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Czy na pewno chcesz ponownie wys�a� wszystkie %d list�w?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Nie zaznaczono �adnego listu"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Nadpisa� plik?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Zapis listu pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Zapis list�w pod podan� nazw�"
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Wy�wietla kolejny nieprzeczytany list"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11859,7 +12121,7 @@ msgstr ""
 "\n"
 "Czy rzeczywi�cie usun�� te listy?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11868,28 +12130,28 @@ msgstr ""
 "B��d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Pobieranie %d. listu z %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Wydruk listu"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiod�o si�"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Czy na pewno chcesz otworzy� wszystkie %d list�w w osobnych oknach?"
@@ -11910,7 +12172,7 @@ msgstr "opis"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt bez nazwy"
@@ -11931,10 +12193,11 @@ msgid "Add Signature"
 msgstr "Zapisz podpis"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Wprowad� poni�ej swoje nazwisko i adres e-mail. Pola oznaczone jako "
 "\"opcjonalne\" nie musz� by� wype�nione,\n"
@@ -11942,10 +12205,10 @@ msgstr ""
 "wysy�anych listach."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Podaj informacje o serwerze, z kt�rego odbierasz poczt�. Je�li nie masz "
 "pewno�ci co do tych informacji,\n"
@@ -11956,24 +12219,23 @@ msgid "Please select among the following options"
 msgstr "Wybierz spo�r�d poni�szych opcji"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Podaj informacje o sposobie, w jaki b�dziesz wysy�a� listy. Je�li nie masz "
 "pewno�ci co do tych informacji,\n"
 "zapytaj administratora lub dostawc� Internetu (ISP)."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Proces konfiguracji poczty zbli�a si� ku ko�cowi. Konto Evolution zostanie "
 "stworzone poprzez zgrupowanie\n"
@@ -11984,43 +12246,20 @@ msgstr ""
 "kont."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Przetwarzanie"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "po"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Sprawdzanie us�ugi"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Nawi�zywanie po��czenia z serwerem..."
 
@@ -12284,241 +12523,229 @@ msgstr "Zapisz i zamknij"
 msgid "Loading Images"
 msgstr "Pobierz _obrazy"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Po�o�enie skrzynki"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Nag��wek listu"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezja"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Serwer NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "�r�d�a _nowo�ci"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informacje opcjonalne"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Wyb�r koloru"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie mo�na otworzy� listu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odpowied� do:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapami�tanie has�a"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Domy�lny"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpieczne MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Wyb�r pliku programu PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Folder z _wys�anymi listami:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Listy wys�ane i szkice"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Konfiguracja serwera"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skr�ty"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Zapisz podpis"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "�r�d�o"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informacje o �r�dle"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nazwa stylu:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12528,206 +12755,202 @@ msgstr ""
 "\n"
 "Aby rozpocz��, kliknij \"Naprz�d\"."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Wsch�d"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Podpis w _HTML-u"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Pobieranie obraz�w z sieci w _ka�dym przypadku"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Typ _uwierzytelniania: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automatyczne sprawdzanie nowych list�w"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certyfikatu:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Podpis w _HTML-u"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Domy�lny"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Uaktywnij"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Prze�lij jako"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Pe�na nazwa:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Listy napisane w HTML-u"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "To�samo��"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Pobieranie obraz�w, je�li nadawca jest w ksi��ce adresowej"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domy�lne"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie list�w jako \"przeczytanych\" po up�ywie"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Bez pobierania jakichkolwiek obraz�w z sieci"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "�cie�ka programu _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 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:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysy�aniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Wszystkim"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Bezpiecze�stwo"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Wysy�anie list�w"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Forma wy�wietlania czasu"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Podpis w _HTML-u"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego po��czenia (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Zmienny"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_co"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " "
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12752,205 +12975,215 @@ msgstr "Nie mo�na stworzy� kontekstu otoczki S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nie mo�na stworzy� kontekstu dekodowania S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie mo�na stworzy� katalogu tymczasowego: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Zapisz na dysk..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Zapis za��cznika"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Wy�wietl na miejscu"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy�wietl na miejscu (za pomoc� programu %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Zewn�trzna przegl�darka"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Pobierz _obrazy"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Wczytywanie tre�ci listu"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Z_aleg�e zadania:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %k:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Otw�rz odno�nik w przegl�darce"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Skopiuj adres odno�nika"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Zapisz odno�nik jako (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Zapisz obraz jako..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "Za��cznik: %s"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 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/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Niepoprawny adres"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Odpowied� do"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Dla"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Dostarczyciel poczty: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Zapis listu pod podan� nazw�"
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "List zosta� podpisany cyfrowo. Kliknij ikon� zamka, aby uzyska� wi�cej "
 "informacji."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nie mo�na stworzy� kontekstu weryfikacji PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "List zosta� podpisany cyfrowo i potwierdzono jego autentyczno��."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "List zosta� podpisany cyfrowo lecz nie potwierdzono jego autentyczno�ci."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska�nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wska�nik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska�nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Wska�nik na zdalne dane (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wska�nik na nieznane zewn�trzne dane (typu \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Niepoprawna forma cz�ci external-body."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokalne foldery"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Przekonfigurowywanie folderu"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Nie mo�na zapisa� metainformacji zwi�zanych z folderem; prawdopodobnie\n"
 "otwarcie folderu nie b�dzie ju� mo�liwe: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie mo�na zapisa� metadanych zwi�zanych z folderem w %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie mo�na usun�� metadanych zwi�zanych z folderem: %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie folderu \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "Nie mo�na przekonfigurowa� %s, poniewa� nie jest on lokalnym folderem"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12958,16 +13191,16 @@ msgstr ""
 "Je�li otwarcie tej skrzynki nie b�dzie ju� mo�liwe,\n"
 "w�wczas mo�e by� konieczne r�czne jej naprawienie."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nie mo�na zmieni� formatu zdalnego folderu."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Zmiana konfiguracji /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12976,7 +13209,7 @@ msgstr ""
 "B��d podczas operacji \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12985,7 +13218,7 @@ msgstr ""
 "B��d przy wykonywaniu operacji:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Przetwarzanie"
 
@@ -12993,100 +13226,100 @@ msgstr "Przetwarzanie"
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Mimo wszystko, list zosta� wys�any pomy�lnie."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Wysy�anie \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysy�anie %d. listu z %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Niepowodzenie przy %d. li�cie z %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie list�w do %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie list�w do %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folder�w w \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Przes�ane listy"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Od�wie�anie folderu"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Pobieranie %d list�w"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Zapisywanie %d list�w"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13095,7 +13328,7 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13104,11 +13337,11 @@ msgstr ""
 "B��d przy zapisie list�w do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Zapisywanie za��cznika"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13117,27 +13350,22 @@ msgstr ""
 "Nie mo�na stworzy� pliku wyj�ciowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo�na zapisa� danych: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Od��czanie od %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawi�zywanie po��czenia z %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Znajd�"
 
@@ -13192,32 +13420,41 @@ msgstr "�cie�ka: %s, Typ: %s"
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Wysy�anie i odbi�r poczty"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Anuluj wszystko"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Aktualizowanie..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez u�ytkownika."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Zapami�tanie has�a"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Zapami�tanie tego has�a na czas bie��cej sesji"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowad� has�o dla %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Wprowad� has�o"
 
@@ -13244,7 +13481,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -13274,7 +13511,7 @@ msgstr "Przes�any list - %s"
 msgid "Forwarded message"
 msgstr "Przes�any list"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Przes�any list"
 
@@ -13288,7 +13525,7 @@ msgstr "Ustawianie vfolderu: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizowanie vfolder�w pod uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13301,95 +13538,98 @@ msgstr ""
 "   \"%s\"\n"
 "I zosta�y zaktualizowane."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Foldery"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Brak tematu)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - List"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Z odpowiedzi�"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych list�w"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Wiele list�w"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Najni�szy"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Ni�szy"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Wy�szy"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Najwy�szy"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Dzi� %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %k:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia list�w"
 
@@ -13424,47 +13664,47 @@ msgstr "Odebrany"
 msgid "Size"
 msgstr "Rozmiar"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Telefon kontaktowy"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Naprz�d"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informacje o �r�dle"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Prze�lij"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Podgl�d"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13488,16 +13728,16 @@ msgstr "Subskrybowanie folderu \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odsubskrybowywanie folderu \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Folder"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
@@ -18423,11 +18663,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24445,8 +24685,8 @@ msgstr "opis"
 msgid "Mail summary"
 msgstr "Zestawienie poczty"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
@@ -24464,15 +24704,15 @@ msgstr "EPGD:EPKK:EPWA"
 msgid "Dictionary.com Word of the Day"
 msgstr "S�owo dnia Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Cytaty dnia"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Nowe �r�d�o nowo�ci"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Podaj URL �r�d�a nowo�ci, kt�re chcesz doda�"
 
@@ -24484,26 +24724,26 @@ msgstr "B��d przy pobieraniu RDF-a"
 msgid "News Feed"
 msgstr "�r�d�o nowo�ci"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Dodaj"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Kr�tkotrwa�a m�awka"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Brak zada�"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Brak opisu)"
 
@@ -25782,7 +26022,8 @@ msgid "Tasks "
 msgstr "Zadania "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Ustawienia dotycz�ce pogody"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25839,7 +26080,7 @@ msgstr "Wy�wietl szczeg�y"
 msgid "Cancel Operation"
 msgstr "Anuluj operacj�"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25853,21 +26094,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Roboczy"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Nadchodz�ce"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Wychodz�ce"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Widziany"
@@ -26099,22 +26340,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - tworzenie nowego folderu"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typ wybranego folderu nie jest poprawny w odniesieniu\n"
-"do ��danej operacji."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Stw�rz _nowy folder..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
 
@@ -26136,7 +26370,7 @@ msgstr ""
 "Je�li nie znasz typu pliku, wybierz \"Automatycznie\", a Evolution spr�buje "
 "go rozpozna�."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Wybierz informacje, kt�re chcesz zaimportowa�:"
 
@@ -26167,22 +26401,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Mo�na importowa� tylko lokalne foldery"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26191,11 +26421,11 @@ msgstr ""
 "�aden z importer�w nie potrafi obs�u�y� pliku\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importowanie"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26204,17 +26434,17 @@ msgstr ""
 "Importowanie %s.\n"
 "Rozpoczynanie %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "B��d przy uruchamianiu %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "B��d odczycie %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26223,31 +26453,31 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Wyb�r pliku"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Typ pliku:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Import danych i ustawie� ze starszych program�w"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Import pojedynczego pliku"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -26255,24 +26485,24 @@ msgstr ""
 "Poczekaj chwil�...\n"
 "Trwa analizowanie istniej�cej konfiguracji"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Wyb�r folderu"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Wybierz folder, do kt�rego powinny zosta� zaimportowane te dane"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -26320,9 +26550,14 @@ msgstr "Otwieranie folderu %s"
 msgid "in \"%s\" ..."
 msgstr "Otw�rz za pomoc� programu %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nie mo�na zmieni� nazwy folderu: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Nie mo�na stworzy� podanego folderu:\n"
 "%s"
@@ -26340,8 +26575,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie mo�na uruchomi� interfejsu druida pocztowego Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nowy"
@@ -26382,58 +26617,59 @@ msgstr "Przej�cie do innego folderu..."
 msgid "Select the folder that you want to open"
 msgstr "Wybierz folder, kt�ry chcesz otworzy�"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Tworzy nowy skr�t"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Wybierz folder, na kt�ry ma wskazywa� skr�t:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Praca _z pod��czeniem"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Praca _bez pod��czenia"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Praca bez pod��czenia"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nie wy�wietlono folderu)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Brak)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie z pod��czeniem do sieci. Aby "
 "przej�� w tryb bez pod��czenia, kliknij ten przycisk."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution przechodzi obecnie w tryb bez pod��czenia do sieci."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dzia�a obecnie w trybie bez pod��czenia do sieci. Aby "
 "przej�� w tryb z pod��czeniem, kliknij ten przycisk."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26445,12 +26681,12 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo�na ustawi� lokalnego miejsca przechowywania -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26461,31 +26697,31 @@ msgstr ""
 "nieoczekiwanie zako�czy� dzia�anie. Aby ponownie uzyska� dost�p do\n"
 "danych, nale�y zako�czy� Evolution, a nast�pnie uruchomi� ponownie."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Nie mo�na dokona� rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "B��d og�lny"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Tworzenie nowej grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26494,107 +26730,117 @@ msgstr ""
 "Czy na pewno chcesz usun�� z paska skr�t�w\n"
 "grup� \"%s\"?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nie usuwaj"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Zmiana nazwy grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Zmie� nazw� wybranej grupy skr�t�w na:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Ma�e ikony"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Wy�wietla skr�ty jako ma�e ikony"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Du�e ikony"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Wy�wietla skr�ty jako du�e ikony"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Tworzy now� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Usu� grup�..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Usuwa t� grup� skr�t�w"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Zmie� nazw� grupy..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Zmienia nazw� grupy skr�t�w"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Ukryj pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ukrywa pasek skr�t�w"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Tworzy nowy skr�t"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Tworzy nowy skr�t"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Zmiana nazwy skr�tu"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Zmie� nazw� wybranego skr�tu na:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Otwiera folder powi�zany ze skr�tem"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otw�rz w nowym _oknie"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Zmie� nazw�"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Zmienia nazw� skr�tu"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Usu�"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Usuwa skr�t z paska skr�t�w"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "B��d przy zapisywaniu skr�t�w."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Skr�ty"
 
@@ -26602,55 +26848,55 @@ msgstr "Skr�ty"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "bez b��du"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Folder o tej nazwie ju� istnieje"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Podany typ folderu nie jest poprawny"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "B��d We/Wy"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na stworzenie folderu"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Folder nie jest pusty"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre�lonego folderu"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funkcja nie zosta�a zaimplementowana dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Podany typ nie jest obs�ugiwany dla tego miejsca przechowywania"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Nie mo�na zmodyfikowa� ani usun�� podanego folderu"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie mo�na ustawi� folderu jako potomka jednego z folder�w podrz�dnych"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Nie mo�na stworzy� folderu o tej nazwie"
 
@@ -26705,63 +26951,63 @@ msgstr ""
 "Opis b��du otrzymany od systemu aktywacji:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "B��d Corby"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Przerwane"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Niepoprawny argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Ma ju� w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Brak w�a�ciciela"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nie odnaleziono"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nieobs�ugiwany typ"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nieobs�ugiwany schemat"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nieobs�ugiwana operacja"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Istnieje"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Niepoprawny URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Zawiera foldery podrz�dne"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Brak miejsca"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Poprzedni w�a�ciciel zako�czy� dzia�anie"
 
@@ -26788,6 +27034,26 @@ msgstr "Komputer"
 msgid "The following connections are currently active:"
 msgstr "Obecnie aktywne s� nast�puj�ce po��czenia:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalendarz"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakty: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Pocz_ta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Zadania"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nazwa folderu:"
@@ -26800,6 +27066,34 @@ msgstr "Typ folderu:"
 msgid "Specify where to create the folder:"
 msgstr "Okre�l miejsce stworzenia folderu:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Stw�rz _nowy folder..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nazwa folderu:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Nazwa serwera:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nazwa _u�ytkownika:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Druid ustawie� Evolution"
@@ -26896,15 +27190,15 @@ msgstr "Nie pytaj o to ponownie"
 msgid "Evolution can import data from the following files:"
 msgstr "Mo�na zaimportowa� do Evolution dane z nast�puj�cych plik�w:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ko�czy prac�..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26924,54 +27218,54 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nie pytaj o to ponownie"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie mo�na uzyska� dost�pu do pow�oki Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie mo�na zainicjowa� pow�oki Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Ukrywa okno powitalne"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Rozpoczynanie importowania"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Uruchamianie inteligentnych importer�w"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotycz�ce przebiegu wykonania komponent�w."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo�na zainicjowa� systemu komponent�w Bonobo."
 
@@ -27008,116 +27302,110 @@ msgstr "Kopiuje zaznaczenie"
 msgid "Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Tworzy nowy kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Tworzy now� list� kontakt�w"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Usuwa zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Przenosi zaznaczone listy do nowego folderu"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto�� schowka"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Wy�wietla podgl�d kontakt�w w postaci przygotowanej do druku"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Podgl�d wyd_ruku"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Drukuje zaznaczone kontakty"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Zapisuje zaznaczone kontakty w formacie VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Wysy�a list do wybranych kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Wy�lij list do kontaktu"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Wysy�a zaznaczone kontakty do innej osoby."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "bie��cym czasem"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "C_zynno�ci"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Lista _kontakt�w"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Prze�lij kontakt..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "P_rzenie� do folderu..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Z_apisz jako VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Szukaj kontakt�w"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Z_aznacz wszystko"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Wy�lij _list do kontaktu..."
@@ -27162,11 +27450,6 @@ msgstr "Miesi�c"
 msgid "Previews the calendar to be printed"
 msgstr "Wy�wietla podgl�d kalendarza w postaci przygotowanej do druku"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Podgl�d wyd_ruku"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Drukuje zawarto�� kalendarza"
@@ -27199,7 +27482,7 @@ msgstr "Tydzie�"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zamknij"
 
@@ -27212,7 +27495,7 @@ msgid "Delete this item"
 msgstr "Usuwa bie��cy element"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "G��wny pasek narz�dziowy"
 
@@ -27224,8 +27507,8 @@ msgstr "Wy�wietla podgl�d elementu w postaci przygotowanej do druku"
 msgid "Print this item"
 msgstr "Drukuje bie��cy element"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Zapisz"
 
@@ -27250,9 +27533,9 @@ msgstr "Zapisuje bie��cy element na dysku"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Plik"
 
@@ -27262,7 +27545,7 @@ msgstr "Wydrukuj _kopert�..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
@@ -27276,8 +27559,8 @@ msgstr "Wy�lij _list do kontaktu..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Zapisz"
 
@@ -27374,28 +27657,38 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trwale usuwa listy oznaczone do usuni�cia ze wszystkich folder�w"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Stw�rz _nowy list"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Zapisywanie listu w folderze"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Wy�wietla podgl�d listu w wydzielonej cz�ci okna"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 "Pozwala za zasubskrybowanie lub odsubskrybowanie folder�w na zdalnych "
 "serwerach"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Edytor wirtualnych folder�w..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtry..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Podgl�d listu"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Su_bskrybcje folder�w..."
 
@@ -27494,7 +27787,7 @@ msgstr "Prze��cza grupowanie list�w w w�tki"
 msgid "_Expunge"
 msgstr "Wy_czy��"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Folder"
 
@@ -27756,181 +28049,196 @@ msgstr "Poprzedni nieprzeczytany list"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Odpowied� na zadanie"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Sprawdzanie nowych list�w we wszystkich folderach"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Poprzedni wa�ny list"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Wy�wietla podgl�d listu w postaci przygotowanej do druku"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Drukuje list"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Przesy�a zaznaczony list do innej osoby"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Przywraca pierwotny rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Przeszukaj list..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Mniejszy"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Zapisuje list w pliku tekstowym"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Wyszukuje tekst w tre�ci wy�wietlanego listu"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Ustala ustawienia strony bie��cej drukarki"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Wy�wietlanie postaci �_r�d�owej listu"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Wy�wietlanie wszystkich _nag��wk�w"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Wy�wietla list w zwyk�y spos�b"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Wy�wietla list wraz ze wszystkimi nag��wkami"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Wy�wietla list w surowej, �r�d�owej postaci"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Rozmiar tekstu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Cofa oznaczenie do usuni�cia dla wszystkich zaznaczonych list�w"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VFolder w oparciu o _list� dyskusyjn�..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VFolder w oparciu o _nadawc�..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VFolder w oparciu o _odbiorc�w..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VFolder w oparciu o _temat..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Za��cz"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Stw�rz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Prze�lij list"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Przejd� do"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Tre�� listu"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Wi�kszy"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Wy�wietlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "P_rzenie� do folderu"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Zwyk�e wy�wietlanie"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Otw�rz list"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Jako cytat"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Zmie� nazw�..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Narz�dzia"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Cofnij usuni�cie"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zamyka bie��ce okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "Zam_knij"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Widok"
 
@@ -27958,169 +28266,161 @@ msgstr "Szyfruje list za pomoc� cerftyfikatu szyfruj�cego S/MIME"
 msgid "For_mat"
 msgstr "_Format"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "_HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Plik te_kstowy..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Wstawia zawarto�� pliku jako tekst do listu"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Wstaw plik tekstowy.."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otw�rz"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Szyfrowanie PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Szyfrowanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Zapisz _szkic"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Zapisz w folderze..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Zapisuje bie��cy plik"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Zapisuje bie��cy plik pod inn� nazw�"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Wy�lij"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Wy�lij p�_niej"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Wy�lij p�_niej"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Okre�la, czy list powinien zosta� wys�any w formacie HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Wysy�a list p�niej"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Wysy�a list natychmiast"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Wy�wietla / ukrywa za��czniki"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Wy�wietlanie _za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Prze��cza wy�wietlanie za��cznik�w"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Podpisuje list za pomoc� klucza PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpisuje list za pomoc� certyfikatu podpisuj�cego S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prze��cza wy�wietlanie pola CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prze��cza wy�wietlanie listy wyboru w polu Od"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prze��cza wy�wietlanie pola Odpowied� do (Reply-To)"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Za��cznik..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Pole _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Pole _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Usu� wszystko"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "W_staw"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Otw�rz..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Pole Odpowied� _do"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "_HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Zapisuje element i zamyka okno dialogowe"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "Pomo_c"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Zapisz podpis"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaje folder do listy zasubskrybowanych folder�w"
@@ -28218,172 +28518,203 @@ msgid "Add to _Shortcut Bar"
 msgstr "Dodaj do paska _skr�t�w"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Alarm Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Zmienia nazw� folderu"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiuje folder"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Stw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Tworzy na pasku skr�t�w odno�nik do bie��cego folderu"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Tworzy nowy folder"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Tworzy nowy skr�t"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Tworzy nowy folder"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Usuwa folder"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Wy�wietla inny folder"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Zako�cz"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Ko�czy prac� programu"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Import danych z innych program�w"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Przenosi folder w inne miejsce"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Stw�rz _nowy folder..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otw�rz w nowym oknie"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otwiera folder w nowym oknie"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Ustawienia pilota..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Wy�lij / Odbierz"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Wysy�a listy w kolejce i pobiera nowe"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Konfiguracja poczty"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Wy�wietla informacje o Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Wy�lij zg�oszenie b��du"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Wy�lij zg�oszenie _b��du"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysy�a zg�oszenie b��du za pomoc� Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Prze��cz"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Prze��cza wy�wietlanie paska folder�w"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prze��cza wy�wietlanie paska skr�t�w"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Prze��cza pomi�dzy trybami pracy z pod��czeniem i bez pod��czenia do sieci."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Wy�wietla zaznaczony folder"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "_Najcz�ciej zadawane pytania"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Informacje o Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Pasek f_older�w"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Folder"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Przejd� do folderu..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Przenie�..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nowy folder"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Ustawienia pilota..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_Brak powtarzalno�ci"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Zmie� nazw�..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "Wy�lij / _Odbierz"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Skr�t"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Pasek _skr�t�w"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Skr�t"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Wydrukuj zestawienie"
@@ -28397,17 +28728,40 @@ msgid "Reload the view"
 msgstr "Od�wie�a widok"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Karty adresowe"
+#, fuzzy
+msgid "By _Company"
+msgstr "Wed�ug firmy"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Wed�ug firmy"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Karty adresowe"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista telefon�w"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Widok tygodnia"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Widok dnia"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Widok miesi�ca"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Widok tygodnia roboczego"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28433,13 +28787,19 @@ msgstr "Wed�ug tematu"
 msgid "Messages"
 msgstr "Listy"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Wraz z kategoriami"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Zadanie"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28593,11 +28953,11 @@ msgstr "Standard kodowania znak�w"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Edytor wyszukiwa�"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Zapisz wyszukiwanie"
 
@@ -28637,21 +28997,21 @@ msgstr "List"
 msgid "Don't show this message again."
 msgstr "Bez wy�wietlania tego komunikatu w przysz�o�ci."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Znajd�"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Wyczy��"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Znajd�"
 
@@ -28665,18 +29025,161 @@ msgstr "Osobisty serwer ksi��ki adresowej"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Osobisty serwer ksi��ki adresowej; generator kalendarza"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nie mo�na zainicjowa� GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nie mo�na zainicjowa� GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Nie mo�na uzyska� lokalnego miejsca przechowywania ksi��ki adresowej.\n"
+#~ "Mo�e to by� spowodowane nieprawid�owym dzia�aniem komponentuevolution-"
+#~ "addressbook. Aby pom�c nam w zrozumieniu i rozwi�zaniu tego\n"
+#~ "problemu, wy�lij e-mail (w j�zyku angielskim) do Jona Trowbridge'a\n"
+#~ "<trow@ximian.com>, szczeg�owo opisuj�c warunki, w jakich pojawi� si�\n"
+#~ "problem. Dzi�kujemy."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Nie mo�na uzyska� dost�pu do lokalnego miejsca przechowywania\n"
+#~ "ksi��ki adresowej, co nie powinno si� normalnie zdarzy�.\n"
+#~ "Aby naprawi� ten problem, konieczne mo�e by� zako�czenie, a\n"
+#~ "nast�pnie ponowne uruchomienie Evolution."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Przenie�..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Termin spotkania zosta� zmieniony. Czy wys�a� aktualn� wersj�?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Usu� termin"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Wydawca: %s\n"
+#~ "Temat: %s"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "B��d We/Wy"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "B��dna odpowied� na powitanie: %s: prawdopodobnie mo�na kontynuowa�"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Up�yn�� czas oczekiwania po HELO: %s: mo�na kontynuowa�"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "B��dna odpowied� na HELO: %s: mo�na kontynuowa�"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Up�yn�� czas oczekiwania po QUIT: %s: mo�na kontynuowa�"
+
+#~ msgid "Insert File"
+#~ msgstr "Wstawienie pliku"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Zosta�a wybrana niepoprawna data."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Data listu b�dzie por�wnywana z czasem\n"
+#~ "zastosowania filtra."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Edytor nowin Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Czy na pewno chcesz usun�� to konto?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Przed wys�aniem listu nale�y skonfigurowa� konto."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Serwer NNTP:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "�r�d�a _nowo�ci"
+
+#~ msgid "Source"
+#~ msgstr "�r�d�o"
+
+#~ msgid "Source Information"
+#~ msgstr "Informacje o �r�dle"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Zapisz na dysk..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Zapis listu pod podan� nazw�"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - tworzenie nowego folderu"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Typ wybranego folderu nie jest poprawny w odniesieniu\n"
+#~ "do ��danej operacji."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Mo�na importowa� tylko lokalne foldery"
+
+#~ msgid "_Contact List"
+#~ msgstr "Lista _kontakt�w"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Plik te_kstowy..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Wstawia zawarto�� pliku jako tekst do listu"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Wstaw plik tekstowy.."
+
+#~ msgid "Send _Later"
+#~ msgstr "Wy�lij p�_niej"
+
+#~ msgid "Send _later"
+#~ msgstr "Wy�lij p�_niej"
+
+#~ msgid "Send the message later"
+#~ msgstr "Wysy�a list p�niej"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Ustawienia pilota..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "�r�d�a ksi��ki adresowej"
@@ -28806,10 +29309,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgstr "Tuvalu"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Plik z podpisem:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Czy�ci wszystko za wyj�tkiem podpisu"
 
@@ -29173,12 +29672,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Republika Mo�dawii"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Tworzy nowy termin"
-
-#~ msgid "Create a new task"
-#~ msgstr "Tworzy nowe zadanie"
-
 #~ msgid "New _Task"
 #~ msgstr "Nowe _zadanie"
 
@@ -29270,9 +29763,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ "Przy tej opcji uwierzytelnianie na serwerze POP b�dzie przeprowadzane "
 #~ "przy u�yciu Kerberosa 4 ."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Nie mo�na przeprowadzi� uwierzytelnienia na serwerze KPOP: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Nie mo�na nawi�za� po��czenia z serwerem: %s"
 
@@ -29312,9 +29802,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Folder przechowuj�cy poczt� (wewn�trzny)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Nie mo�na nawi�za� po��czenia z miejscem przechowywania: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Nowy _list"
 
@@ -29357,9 +29844,6 @@ msgstr "init_bonobo(): nie mo�na zainicjowa� Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizacja:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Zapami�tanie has�a"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Domy�lne _wysy�anie list�w w formacie HTML."
 
diff --git a/po/pt.po b/po/pt.po
index afa6856078..f1c7c7b70d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago Ant�o <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "File As"
 msgstr "_Pasta"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 #, fuzzy
 msgid "Name"
@@ -362,49 +362,49 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "Ano"
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "Imprimir calend�rio"
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Criar um novo calend�rio"
@@ -503,11 +503,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 #, fuzzy
 msgid "Contacts"
 msgstr "_Contacto"
@@ -527,27 +527,36 @@ msgstr "Servidor:"
 msgid "LDAP server containing contact information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "New Contact List"
+msgid "New Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
 #, fuzzy
-msgid "Contact _List"
+msgid "_Contact"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:565
 #, fuzzy
-msgid "New Contact"
+msgid "Create a new contact"
+msgstr "Criar um novo contacto"
+
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "New Contact List"
 msgstr "_Contacto"
 
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
-msgid "_Contact"
+msgid "Contact _List"
 msgstr "_Contacto"
 
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "A sua lista de contactos"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -566,25 +575,25 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 msgid "Server did not respond with valid schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 #, fuzzy
 msgid "Could not initialize gnome-vfs"
 msgstr "N�o se consegui inicializar Bonobo"
@@ -594,18 +603,18 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Other Contacts"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
 "is down"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -613,52 +622,52 @@ msgid ""
 "retrieving OpenLDAP from the link below.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Correio electr�nico 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "�cone_s pequenos"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrar�"
 
@@ -783,7 +792,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adicionar Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -878,8 +887,8 @@ msgstr "Configura��o do correio"
 msgid "Mappings"
 msgstr "�cones _grandes"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Remover"
@@ -934,8 +943,8 @@ msgstr "Ano"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "Ano"
@@ -1125,15 +1134,15 @@ msgid "Using email address"
 msgstr "Endere�o de correio:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 #, fuzzy
 msgid "_Add"
 msgstr "Adicionar"
@@ -1180,12 +1189,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 #, fuzzy
 msgid "_Edit"
@@ -1301,10 +1310,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Remover"
 
@@ -1338,33 +1347,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "_Novo Contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Encontrar um contacto"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #, fuzzy
 msgid "Select Names"
@@ -1387,15 +1378,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "Sg"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "_Folder:"
 msgstr "_Pasta"
@@ -1511,11 +1497,12 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
@@ -2826,7 +2813,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 #, fuzzy
 msgid "_Remove"
 msgstr "Remover"
@@ -2893,7 +2880,7 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 #, fuzzy
 msgid "Advanced Search"
 msgstr "Adicionar..."
@@ -2925,13 +2912,13 @@ msgid "Error getting book view"
 msgstr "Erro a gravar os atalhos."
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 #, fuzzy
 msgid "Success"
 msgstr "Fontes"
@@ -2939,8 +2926,8 @@ msgstr "Fontes"
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr ""
 
@@ -2948,8 +2935,8 @@ msgstr ""
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr ""
 
@@ -2967,7 +2954,7 @@ msgid "Protocol not supported"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2991,52 +2978,57 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
 #, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Adicionar Fonte"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
+#, fuzzy
 msgid "Other error"
 msgstr "Outro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 #, fuzzy
 msgid "Error adding list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 #, fuzzy
 msgid "Error adding card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 #, fuzzy
 msgid "Error removing list"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 #, fuzzy
 msgid "Error removing card"
 msgstr "Erro a gravar os atalhos."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Dia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Dia"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3044,22 +3036,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "_Come�ando"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "_Come�ando"
@@ -3142,7 +3134,7 @@ msgstr "Imposs�vel abrir o livro de endere�os"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
@@ -3182,7 +3174,7 @@ msgid "Pilot Settings..."
 msgstr "Configura��o do co_rreio..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Enviar esta mensagem"
@@ -3193,8 +3185,8 @@ msgid "Send Message to Contact"
 msgstr "Enviar mensagem em formato HTML"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -3215,7 +3207,7 @@ msgid "Move to folder..."
 msgstr "Ir para a _pasta..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
@@ -3226,20 +3218,20 @@ msgid "Copy"
 msgstr "Copiar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Apagar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Ano corrente (%Y)"
@@ -3412,7 +3404,7 @@ msgstr "�cones _grandes"
 msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Options"
 msgstr "_Op��es"
@@ -3520,29 +3512,29 @@ msgstr "_Editar Compromisso"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 #, fuzzy
 msgid "High"
 msgstr "Cabe�alhos:"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 #, fuzzy
 msgid "Low"
 msgstr "Novo"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr ""
@@ -3676,12 +3668,12 @@ msgstr ""
 msgid "_Edit appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 #, fuzzy
 msgid "No description available."
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3689,14 +3681,14 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 #, fuzzy
 msgid "Warning"
 msgstr "Seg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3707,7 +3699,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Enviar esta mensagem"
@@ -3741,7 +3733,7 @@ msgstr "Nenhuma descri��o"
 msgid "Comment contains"
 msgstr "Assunto"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3752,7 +3744,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr ""
 
@@ -3774,18 +3766,18 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr ""
@@ -3812,7 +3804,7 @@ msgstr ""
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3820,24 +3812,24 @@ msgstr "Semana"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 #, fuzzy
 msgid "Not Started"
 msgstr "_Come�ando"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -3845,7 +3837,7 @@ msgstr ""
 msgid "Completed"
 msgstr "Cores"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3853,61 +3845,60 @@ msgid ""
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Nenhuma"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 #, fuzzy
 msgid "No"
 msgstr "Novo"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 #, fuzzy
 msgid "Day View"
 msgstr "_Novo"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 #, fuzzy
 msgid "Work Week View"
 msgstr "Semana"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 #, fuzzy
 msgid "Week View"
 msgstr "Semana"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 #, fuzzy
 msgid "Month View"
 msgstr "M�s"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lend�rio"
@@ -3917,12 +3908,12 @@ msgstr "Novo Ca_lend�rio"
 msgid "Folder containing appointments and events"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
@@ -3932,45 +3923,65 @@ msgstr "_Tarefa"
 msgid "Folder containing to-do items"
 msgstr "Uma pasta contendo entradas de calend�rio"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Compromissos:"
+
+#: calendar/gui/component-factory.c:709
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso para hoje"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Seg"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Criar um novo contacto"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 #, fuzzy
-msgid "New All Day Appointment"
-msgstr "Novo compromisso"
+msgid "Create a new task"
+msgstr "Criar um novo contacto"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "All _Day Appointment"
+msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
-msgid "New appointment"
+msgid "All _Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "Compromissos:"
+msgid "Create a new all-day appointment"
+msgstr "Criar um novo compromisso para hoje"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -4038,7 +4049,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 #, fuzzy
 msgid "days"
 msgstr "DiasRascunhos"
@@ -4047,12 +4059,14 @@ msgstr "DiasRascunhos"
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 #, fuzzy
 msgid "hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 #, fuzzy
 msgid "minutes"
 msgstr "Minutos"
@@ -4190,7 +4204,7 @@ msgstr "Enviar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
 msgstr "Sum�rio:"
@@ -4225,7 +4239,7 @@ msgstr "_Editar Compromisso"
 msgid "hour(s)"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 #, fuzzy
 msgid "minute(s)"
 msgstr "Minutos"
@@ -4424,7 +4438,7 @@ msgid "_Fri"
 msgstr "Sex"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr ""
 
@@ -4471,19 +4485,33 @@ msgstr "Qua"
 msgid "before every appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr ""
 
@@ -4552,62 +4580,62 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada di�ria?"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nenhum sum�rio"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4829,7 +4857,7 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4842,7 +4870,7 @@ msgstr "Telem�vel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 #, fuzzy
 msgid "Status"
@@ -4931,7 +4959,7 @@ msgstr "Seg"
 msgid "first"
 msgstr "Pr�_ximo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 #, fuzzy
 msgid "second"
 msgstr " segundos"
@@ -4956,7 +4984,7 @@ msgstr "Pr�_ximo"
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
@@ -5070,22 +5098,29 @@ msgstr ""
 msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "Remover grupo"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 #, fuzzy
 msgid "Progress"
 msgstr "Propriedades do alarme"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 #, fuzzy
 msgid "_Priority:"
 msgstr "Prioridade:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 #, fuzzy
 msgid "_Status:"
 msgstr "S�b"
@@ -5102,7 +5137,7 @@ msgstr "Colar"
 msgid "Assignment"
 msgstr "Compromissos:"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 #, fuzzy
@@ -5173,86 +5208,86 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 #, fuzzy
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Gravar como VCard"
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
 msgstr "Cortar"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 #, fuzzy
 msgid "_Copy"
 msgstr "Copiar"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "_Paste"
 msgstr "Colar"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Apagar este item"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5263,8 +5298,8 @@ msgstr "Pressione aqui para o livro de endere�os"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 #, fuzzy
 msgid "Complete"
 msgstr "Cores"
@@ -5295,11 +5330,9 @@ msgstr "Prioridade"
 msgid "Start Date"
 msgstr "Hora de �n_icio de encontro"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 #, fuzzy
 msgid "Summary"
 msgstr "Sum�rio"
@@ -5340,119 +5373,118 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 #, fuzzy
 msgid "New _Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Seg"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Go to _Today"
 msgstr "Hoje"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Ir para a _pasta..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura��o do correio"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configura��o do correio"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Save As..."
 msgstr "Gravar na _pasta..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Fontes"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Imprimir calend�rio"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta ocurr�ncia"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Apagar todas as ocurr�ncias"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro a gravar os atalhos."
@@ -5502,7 +5534,7 @@ msgstr "Cores"
 msgid "Task Due: <b>"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "Nenhuma Informa��o"
@@ -5513,359 +5545,364 @@ msgstr "Nenhuma Informa��o"
 msgid "iCalendar Error"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Ac��es"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "S�b"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr "Receber"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "�cone_s pequenos"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "Receber"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Pedido de _encontro"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Seg"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Mensagens enviadas"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "_Tarefa"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "_Pedido de tarefa"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "Responder"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Encontrar mensagens"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "N�o consegui correr o Bub buddy"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "Cores"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Data"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "_Nova pasta"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "_Nova pasta"
@@ -5916,7 +5953,7 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr ""
 
@@ -5929,62 +5966,56 @@ msgid "Non-Participants"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "Grupo %i"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "Fontes"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Chair"
 msgstr "Carro"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 #, fuzzy
 msgid "Required Participant"
 msgstr "Pessoas _Necess�rias"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "Remover grupo"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "Apagar"
@@ -6075,50 +6106,46 @@ msgstr "Hora de �n_icio de encontro"
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrir ficheiro"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Apagar um contacto"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Cabe�alhos:"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-week-view.c:3489
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "Novo compromisso"
-
 #: calendar/gui/gnome-cal.c:1522
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
@@ -6129,11 +6156,16 @@ msgstr "Criar um novo calend�rio"
 msgid "The method required to open `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrir calend�rio"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Abrir ficheiro"
+
 #: calendar/gui/goto-dialog.glade.h:1
 #, fuzzy
 msgid "April"
@@ -6196,58 +6228,63 @@ msgstr "Outro"
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "Nenhuma Informa��o"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Ano"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "N�o se consegui inicializar Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Criar um novo calend�rio"
@@ -6479,9 +6516,8 @@ msgid "Print Calendar"
 msgstr "Imprimir calend�rio"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Prever impress�o"
 
@@ -6513,8 +6549,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Enviar esta mensagem"
@@ -6569,128 +6605,138 @@ msgstr ""
 msgid "Imports vCalendar files into Evolution"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Criar um novo calend�rio"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Enviar"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Novo Ca_lend�rio"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "_Fechar Calend�rio"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8291,77 +8337,85 @@ msgstr "Abrir ficheiro"
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, fuzzy, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 #, fuzzy
 msgid "Cannot open message"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, fuzzy, c-format
 msgid "Failed on message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Sincronizar"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:399
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro a gravar os atalhos."
@@ -8414,7 +8468,7 @@ msgstr "Erro a gravar os atalhos."
 msgid "Copying messages"
 msgstr "Encontrar mensagens"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8422,46 +8476,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8469,18 +8523,18 @@ msgid ""
 "%.*s"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Anexar um ficheiro � mensagem"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Criar um novo calend�rio"
@@ -8506,22 +8560,22 @@ msgid "Could not lock '%s'"
 msgstr "Criar um novo calend�rio"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
@@ -8580,11 +8634,15 @@ msgstr ""
 msgid "Error copying mail temp file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8706,7 +8764,7 @@ msgid ""
 msgstr ""
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8879,26 +8937,127 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, fuzzy, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
-msgstr "Assunto"
+#: camel/camel-tcp-stream-openssl.c:566
+msgid "Unable to get issuer's certificate"
+msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to decrypt certificate signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Ficheiro com assinatura:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Fora do escrit�rio"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to verify leaf signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Novo Ca_lend�rio"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8907,16 +9066,28 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8931,32 +9102,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Criar um novo calend�rio"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Erro a gravar os atalhos."
+
+#: camel/camel-vee-folder.c:656
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Enviar a mensagem"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verificar novo correio"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -8964,13 +9140,13 @@ msgstr "N�o consigo abrir a localiza��o: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "Abrir calend�rio"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -8999,42 +9175,42 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Enviar uma nova mensagem"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9043,10 +9219,10 @@ msgstr ""
 msgid "Could not open cache directory: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Anexar um ficheiro � mensagem"
@@ -9061,7 +9237,7 @@ msgstr "Verificar novo correio"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novo correio"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "_Pastas"
 
@@ -9092,7 +9268,7 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Password"
 msgstr "Esquecer _Senhas"
@@ -9101,70 +9277,74 @@ msgstr "Esquecer _Senhas"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor:"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, c-format
+msgid "The folder %s no longer exists"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentica��o"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9172,31 +9352,37 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, fuzzy, c-format
 msgid "No such folder %s"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s%s"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s%s"
@@ -9219,7 +9405,9 @@ msgid "Local delivery"
 msgstr "_Pastas"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9246,12 +9434,12 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9262,38 +9450,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
@@ -9351,7 +9539,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9387,26 +9575,26 @@ msgstr ""
 msgid "Could not scan folder `%s': %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, fuzzy, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Verificar novo correio"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9450,35 +9638,35 @@ msgstr ""
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
@@ -9493,64 +9681,64 @@ msgstr "Criar um novo calend�rio"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
@@ -9697,50 +9885,50 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "Abrir calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Encontrar mensagens"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Abrir calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Enviar esta mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Imposs�vel abrir o livro de endere�os"
@@ -9760,7 +9948,7 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "Delete after %s day(s)"
 msgstr "Apagar este item"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr ""
 
@@ -9781,6 +9969,11 @@ msgid ""
 "claim to support it."
 msgstr ""
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Criar um novo calend�rio"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9790,50 +9983,52 @@ msgstr "Criar um novo calend�rio"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Criar um novo calend�rio"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
-msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+msgstr "Autentica��o"
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
-msgid "SASL `%s' Login failed: %s"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Criar um novo calend�rio"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
-msgstr ""
+msgstr "Criar um novo calend�rio"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -9859,35 +10054,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, fuzzy, c-format
 msgid "Could not send message: %s"
 msgstr "Criar uma nova mensagem"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr ""
 
@@ -9999,41 +10194,40 @@ msgstr "Autentica��o"
 msgid "Authentication required"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+msgid "Welcome response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Criar um novo calend�rio"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10041,90 +10235,90 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 #, fuzzy
 msgid "Sending message"
 msgstr "Mensagens enviadas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr ""
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "HELO request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Outro"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentica��o"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -10132,87 +10326,87 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1386
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "QUIT request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr ""
@@ -10232,58 +10426,62 @@ msgid "MIME type:"
 msgstr ""
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endere�os"
 
 #.
-#. * From:
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:370
+#: composer/e-msg-composer-hdrs.c:378
 #, fuzzy
-msgid "From:"
-msgstr "De"
+msgid "Reply-To:"
+msgstr "Responder"
 
 #.
-#. * Reply-To:
+#. * From
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:389
 #, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
+msgid "From:"
+msgstr "De"
 
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que ir�o receber uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10291,138 +10489,141 @@ msgstr ""
 "Entre os endere�os que ir�o receber uma c�pia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Prioridade:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, fuzzy, c-format
 msgid ""
 "Error while reading file %s:\n"
 "%s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 #, fuzzy
 msgid "Warning!"
 msgstr "Seg"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Enviar esta mensagem"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1569
-#, fuzzy
-msgid "Insert File"
-msgstr "_Inserir"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Ficheiro com assinatura:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "Apagar"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 msgstr ""
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10497,19 +10698,18 @@ msgstr "Assunto"
 msgid "Subject does not contain"
 msgstr "Assunto"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr ""
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10608,262 +10808,283 @@ msgstr ""
 msgid "%I %p"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-#, fuzzy
-msgid "year"
-msgstr "Ano"
-
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
 #, fuzzy
-msgid "years"
-msgstr "Ano"
+msgid "seconds"
+msgstr " segundos"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:71
 #, fuzzy
-msgid "month"
-msgstr "M�s"
+msgid "minute"
+msgstr "Minuto"
 
-#: filter/filter-datespec.c:81
+#: filter/filter-datespec.c:72
 #, fuzzy
-msgid "months"
-msgstr "M�s"
+msgid "hour"
+msgstr "Hora"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 #, fuzzy
 msgid "week"
 msgstr "Semana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 #, fuzzy
 msgid "weeks"
 msgstr "Semanas"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:75
 #, fuzzy
-msgid "hour"
-msgstr "Hora"
+msgid "month"
+msgstr "M�s"
 
-#: filter/filter-datespec.c:85
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
 #, fuzzy
-msgid "minute"
-msgstr "Minuto"
+msgid "months"
+msgstr "M�s"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
+#: filter/filter-datespec.c:76
 #, fuzzy
-msgid "seconds"
-msgstr " segundos"
-
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
-msgstr ""
-
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr ""
+msgid "year"
+msgstr "Ano"
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+#, fuzzy
+msgid "years"
+msgstr "Ano"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
+#: filter/filter-datespec.c:174
+msgid "You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
 msgstr ""
 
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
 msgstr ""
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+msgid "%d-%b-%Y"
 msgstr ""
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
 
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "_Items seleccionados"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr ""
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr ""
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr ""
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nome completo:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Apagar um contacto"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 #, fuzzy
 msgid "Then"
 msgstr "Qi"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 #, fuzzy
 msgid "Add action"
 msgstr "_Ac��es"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 #, fuzzy
 msgid "Select Folder"
 msgstr "_Nova pasta"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr ""
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Seg"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Para:"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "Data"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem t�tulo)"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr ""
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr ""
 
 #: filter/filter.glade.h:1
-msgid "Edit Filters"
+msgid "Compare against"
 msgstr ""
 
 #: filter/filter.glade.h:2
+msgid "Edit Filters"
+msgstr ""
+
+#: filter/filter.glade.h:3
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_Pastas"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr ""
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_Pastas"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:27
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:28
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Adicionar Fonte"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr ""
 
@@ -10893,46 +11114,46 @@ msgstr "Tamanho"
 
 #: filter/libfilter-i18n.h:7
 #, fuzzy
-msgid "Command"
-msgstr "Empresa"
-
-#: filter/libfilter-i18n.h:8
-#, fuzzy
 msgid "contains"
 msgstr "_Ac��es"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 #, fuzzy
 msgid "Deleted"
 msgstr "Apagar"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr ""
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Ficheiro n�o encontrado"
+
 #: filter/libfilter-i18n.h:17
 #, fuzzy
 msgid "does not sound like"
@@ -10957,93 +11178,88 @@ msgstr ""
 
 #: filter/libfilter-i18n.h:22
 #, fuzzy
-msgid "Execute Shell Command"
-msgstr "Sum�rio executivo"
-
-#: filter/libfilter-i18n.h:23
-#, fuzzy
 msgid "Exist"
 msgstr "Pr�_ximo"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 #, fuzzy
 msgid "Message Body"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 #, fuzzy
 msgid "Message Header"
 msgstr "Situa��o das mensagens"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "Move to Folder"
 msgstr "Ir para a _pasta..."
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Sum�rio executivo"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Esquecer _Senhas"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 #, fuzzy
 msgid "Read"
 msgstr "Remover"
@@ -11061,64 +11277,92 @@ msgstr ""
 msgid "Replied to"
 msgstr "Reponder para todos"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Ocupado"
+
+#: filter/libfilter-i18n.h:47
+msgid "returns greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:48
+msgid "returns less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 #, fuzzy
 msgid "Score"
 msgstr "Fontes"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 #, fuzzy
 msgid "Sender"
 msgstr "Enviar"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 #, fuzzy
 msgid "Set Status"
 msgstr "Situa��o online"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Sum�rio executivo"
+
+#: filter/libfilter-i18n.h:53
 #, fuzzy
 msgid "Size (kB)"
 msgstr "Tamanho"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 #, fuzzy
 msgid "Source Account"
 msgstr "�cone_s pequenos"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Situa��o online"
+
+#: filter/rule-editor.c:180
 #, fuzzy
 msgid "Rules"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 #, fuzzy
 msgid "Add Rule"
 msgstr "Adicionar Fonte"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 #, fuzzy
 msgid "Edit Rule"
 msgstr "Adicionar Fonte"
@@ -11128,12 +11372,12 @@ msgstr "Adicionar Fonte"
 msgid "Score Rules"
 msgstr "Fontes"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Apagar este item"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11141,32 +11385,32 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Seg"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr ""
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
 msgstr "Seg"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Sincronizar"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 #, fuzzy
 msgid "Mail"
 msgstr "_Correio"
@@ -11224,41 +11468,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 #, fuzzy
 msgid "Trash"
 msgstr "_Tarefa"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Sincronizar"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr ""
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr ""
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 #, fuzzy
 msgid "Settings"
 msgstr "Segundos"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "_Pasta"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11343,12 +11587,12 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 msgid "Font Preferences"
 msgstr "Prefer�ncias"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "�cone_s pequenos"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Prefer�ncias"
@@ -11404,69 +11648,89 @@ msgstr "Propriedades do alarme"
 msgid "Change this folder's properties"
 msgstr "Propriedades"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Mensagem de _correio"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Criar uma nova mensagem"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Mensagem de _correio"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Encontrar mensagens"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Criar uma nova mensagem"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ano"
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, fuzzy, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -11516,145 +11780,145 @@ msgstr ""
 msgid "Create _Virtual Folder From Search..."
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "Assunto"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Situa��o das mensagens"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 #, fuzzy
 msgid "Filter on Sub_ject"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 #, fuzzy
 msgid "Filter on Sen_der"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 #, fuzzy
 msgid "Filter on Re_cipients"
 msgstr "Ficheiro n�o encontrado"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Encontrar mensagens"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 #, fuzzy
 msgid "Reply to _List"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr ""
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Cores"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Carro"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Apagar"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Imposs�vel abrir o livro de endere�os"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Dru�da dos _filtros"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Uma pasta contendo items de correio"
@@ -11722,82 +11986,72 @@ msgstr "Correio novo"
 msgid "mh"
 msgstr "h"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-#, fuzzy
-msgid "Evolution News Editor"
-msgstr "Atalho para _barra do Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "Atalho para _barra do Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Host:"
 msgstr "Horas"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Utilizador:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "Caminho"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 #, fuzzy
 msgid "Don't delete"
 msgstr "Apagar"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr ""
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 #, fuzzy
 msgid "Disable"
 msgstr "Como _Tabela"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr ""
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr ""
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11806,30 +12060,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Fontes de correio"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "Assunto"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "Fontes de correio"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11837,7 +12091,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11845,135 +12099,131 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Enviar"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr ""
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11981,37 +12231,37 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 #, fuzzy
 msgid "Filters"
 msgstr "_Pasta"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12032,7 +12282,7 @@ msgstr "Nenhuma descri��o"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "_Novo Contacto"
@@ -12054,15 +12304,14 @@ msgstr "Ficheiro com assinatura:"
 #: mail/mail-config-druid.c:146
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 
 #: mail/mail-config-druid.c:148
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:150
@@ -12072,60 +12321,34 @@ msgstr ""
 #: mail/mail-config-druid.c:152
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
 #: mail/mail-config-druid.c:154
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Atalho para _barra do Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Seg"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Para:"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "Data"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�cone_s pequenos"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr ""
 
@@ -12382,450 +12605,431 @@ msgstr "Guardar Calend�rio como"
 msgid "Loading Images"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Mailbox location"
 msgstr "F_ormato"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Mensagem de _correio"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
-#, fuzzy
-msgid "NNTP Server:"
-msgstr "Servidor:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Optional Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organiza��o:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr ""
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir contactos"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quoted"
 msgstr "Nenhuma"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Receber"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 #, fuzzy
 msgid "Required Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Apagar"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "_Items seleccionados"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 #, fuzzy
 msgid "Sending Email"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Configura��o do correio"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Servidor:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Mudar nome de atalho"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:120
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
-
-#: mail/mail-config.glade.h:121
-#, fuzzy
-msgid "Source Information"
-msgstr "Nenhuma Informa��o"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Colar"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Autentica��o"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verificar novo correio"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 msgid "_Confirm when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Apagar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Bip"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Situa��o das mensagens"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "Nome"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Receber"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Reponder para todos"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviar"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Horas"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 msgid "_Variable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Remover"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "Nenhuma descri��o"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12854,238 +13058,247 @@ msgstr "N�o se consegui inicializar Bonobo"
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr ""
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Anexo"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-display.c:1454
 #, fuzzy
 msgid "Loading message content"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 msgid "Overdue:"
 msgstr ""
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr ""
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "�brir em nova janela"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr ""
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Gravar como VCard"
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 #, fuzzy
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Endere�o"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 #, fuzzy
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 #, fuzzy
 msgid "Reply-To"
 msgstr "Responder"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 #, fuzzy
 msgid "To"
 msgstr "Para:"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "_Correio"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Encontrar mensagens"
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "_Pastas"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
-msgstr ""
+msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o consigo abrir a localiza��o: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "_Nova pasta"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 #, fuzzy
 msgid "Working"
 msgstr "Seg"
@@ -13095,151 +13308,146 @@ msgstr "Seg"
 msgid "Filtering Folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Enviar"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 #, fuzzy
 msgid "Complete."
 msgstr "Cores"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, fuzzy, c-format
 msgid "Opening folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "_Nova pasta"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Retrieving message %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Erro a gravar os atalhos."
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 #, fuzzy
 msgid "Saving attachment"
 msgstr "Anexo"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Criar um novo calend�rio"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 #, fuzzy
 msgid "_Search"
 msgstr "Ano"
@@ -13302,35 +13510,44 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Para:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Receber"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Novo Ca_lend�rio"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr ""
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 #, fuzzy
 msgid "User canceled operation."
 msgstr "Nenhuma Informa��o"
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Mudar nome de atalho"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "Esquecer _Senhas"
@@ -13356,7 +13573,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
@@ -13388,7 +13605,7 @@ msgstr "Enviar esta mensagem"
 msgid "Forwarded message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Enviar esta mensagem"
@@ -13403,7 +13620,7 @@ msgstr "Abrir ficheiro"
 msgid "Updating vfolders for uri: %s"
 msgstr "Abrir ficheiro"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13412,104 +13629,107 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "Assunto"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mensagem de _correio"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Criar uma nova mensagem"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Encontrar mensagens"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 #, fuzzy
 msgid "Higher"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 #, fuzzy
 msgid "Highest"
 msgstr "Cabe�alhos:"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 #, fuzzy
 msgid "Generating message list"
 msgstr "Encontrar mensagens"
@@ -13546,46 +13766,46 @@ msgstr "Receber"
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Enviar esta mensagem"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Nenhuma Informa��o"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Reponder para todos"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Prever impress�o"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13609,18 +13829,18 @@ msgstr ""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Abrir ficheiro"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 #, fuzzy
 msgid "Folder"
 msgstr "_Pastas"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Situa��o das mensagens"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18400,11 +18620,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24267,8 +24487,8 @@ msgstr "Nenhuma descri��o"
 msgid "Mail summary"
 msgstr "Nenhum sum�rio"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "_Pastas"
@@ -24287,16 +24507,16 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 #, fuzzy
 msgid "Add a news feed"
 msgstr "Adicionar novo grupo"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -24310,27 +24530,27 @@ msgstr "Erro a gravar os atalhos."
 msgid "News Feed"
 msgstr "Servidor:"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Adicionar"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Horas"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 #, fuzzy
 msgid "No tasks"
 msgstr "Ver _anexos"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "Nenhuma descri��o"
@@ -25639,8 +25859,9 @@ msgid "Tasks "
 msgstr "_Tarefa"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
-msgstr ""
+#, fuzzy
+msgid "Weather Settings"
+msgstr "Segundos"
 
 #: my-evolution/my-evolution.glade.h:18
 msgid "_Fahrenheit"
@@ -25703,7 +25924,7 @@ msgstr "Ver _anexos"
 msgid "Cancel Operation"
 msgstr ""
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25715,23 +25936,23 @@ msgstr "Gravar a mensagem na pasta especificada"
 msgid "Add a Folder"
 msgstr "_Nova pasta"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Data"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 #, fuzzy
 msgid "Inbox"
 msgstr "Correio novo"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 #, fuzzy
 msgid "Outbox"
 msgstr "Correio novo"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "Enviar"
@@ -25941,21 +26162,15 @@ msgstr "Gravar a mensagem na pasta especificada"
 
 #: shell/e-shell-folder-creation-dialog.c:291
 #, fuzzy
-msgid "Evolution - Create new folder"
-msgstr "O Evolution n�o consegue criar as suas pastas locais"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+msgid "Create New Folder"
+msgstr "Criar um novo calend�rio"
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sem t�tulo)"
 
@@ -25972,7 +26187,7 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -25998,110 +26213,106 @@ msgstr ""
 msgid "Select importer"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
 "%s"
 msgstr ""
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 #, fuzzy
 msgid "Importing"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
 "Starting %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, fuzzy, c-format
 msgid "Error starting %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, fuzzy, c-format
 msgid "Error loading %s"
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 #, fuzzy
 msgid "Filename:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 #, fuzzy
 msgid "Select a file"
 msgstr "Ficheiro com assinatura:"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 #, fuzzy
 msgid "File type:"
 msgstr "Nome completo:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "Seg"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 #, fuzzy
 msgid "Select folder"
 msgstr "_Nova pasta"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr ""
 
@@ -26147,9 +26358,14 @@ msgstr "Abrir ficheiro"
 msgid "in \"%s\" ..."
 msgstr "Segundos"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Criar um novo calend�rio"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr "Gravar a mensagem na pasta especificada"
 
 #: shell/e-shell-startup-wizard.c:159
@@ -26164,8 +26380,8 @@ msgstr "N�o consigo inicializar o componente de mail do Evolution."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -26209,59 +26425,59 @@ msgstr "Ir para a _pasta..."
 msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:594
+#: shell/e-shell-view-menu.c:595
 #, fuzzy
-msgid "Create a new shortcut"
+msgid "Create New Shortcut"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 #, fuzzy
 msgid "_Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 #, fuzzy
 msgid "Work Offline"
 msgstr "Seg"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr ""
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "Nome"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26269,12 +26485,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26282,159 +26498,169 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 #, fuzzy
 msgid "Configuration Database not found"
 msgstr "Configura��o do correio"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 #, fuzzy
 msgid "Create new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 #, fuzzy
 msgid "Group name:"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 #, fuzzy
 msgid "_Small Icons"
 msgstr "�cone_s pequenos"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 #, fuzzy
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co �cones grandes"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 #, fuzzy
 msgid "_New Group..."
 msgstr "Novo grupo"
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 #, fuzzy
 msgid "Create a new shortcut group"
 msgstr "Criar um novo contacto"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 #, fuzzy
 msgid "_Remove this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 #, fuzzy
 msgid "Re_name this Group..."
 msgstr "Remover grupo"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 #, fuzzy
 msgid "Rename this shortcut group"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Mostrar barra de atalho_s"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Criar um novo contacto"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Criar um novo contacto"
+
+#: shell/e-shortcuts-view.c:394
 #, fuzzy
 msgid "Rename shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 #, fuzzy
 msgid "Rename selected shortcut to:"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 #, fuzzy
 msgid "Open in New _Window"
 msgstr "�brir em nova janela"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "Rename this shortcut"
 msgstr "Mudar nome de atalho"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "Remover"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 #, fuzzy
 msgid "Shortcuts"
 msgstr "Mudar nome de atalho"
@@ -26443,55 +26669,55 @@ msgstr "Mudar nome de atalho"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr ""
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "N�o consigo abrir a localiza��o: %s"
@@ -26536,73 +26762,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "Nenhuma"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "Ficheiro n�o encontrado"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Transporte de correio"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Nenhuma Informa��o"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "Outro"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "Pr�_ximo"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Novo Ca_lend�rio"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Enviar a mensagem"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "Situa��o das mensagens"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26629,6 +26855,26 @@ msgstr "Horas"
 msgid "The following connections are currently active:"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Novo Ca_lend�rio"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Contacto"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correio"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Tarefa"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
 msgid "Folder name:"
@@ -26644,6 +26890,34 @@ msgstr "_Pastas"
 msgid "Specify where to create the folder:"
 msgstr "Gravar a mensagem na pasta especificada"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Criar um novo calend�rio"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome completo:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Encontrar mensagens"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Utilizador:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26736,16 +27010,16 @@ msgstr ""
 msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution"
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26765,54 +27039,54 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Evolution - %s"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Enviar esta mensagem"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o consigo inicializar o componente de mail do Evolution."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Enviar uma nova mensagem"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Enviar uma nova mensagem"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializa��o do sistema de componentes Bonobo."
 
@@ -26854,135 +27128,127 @@ msgstr "Anular a �ltima opera��o"
 msgid "Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:6
-#, fuzzy
-msgid "Create new contact"
-msgstr "Criar um novo contacto"
-
-#: ui/evolution-addressbook.xml.h:7
-#, fuzzy
-msgid "Create new contact list"
-msgstr "A sua lista de contactos"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete selected contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Colar item da �rea de transfer�ncia"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+#, fuzzy
+msgid "Print Pre_view"
+msgstr "Prever impress�o"
+
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Print selected contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Select All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "Select all contacts"
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Apagar um contacto"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 #, fuzzy
 msgid "Send message to contact"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 #, fuzzy
 msgid "Stop"
 msgstr "Fontes"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Cabe�alhos:"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Ac��es"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "_Contacto"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contacto"
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Gravar como VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Novo Contacto"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 #, fuzzy
 msgid "_Select All"
 msgstr "Reponder para todos"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar mensagem em formato HTML"
@@ -27034,12 +27300,6 @@ msgstr "M�s"
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-#, fuzzy
-msgid "Print Pre_view"
-msgstr "Prever impress�o"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -27077,7 +27337,7 @@ msgstr "Semana"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 #, fuzzy
 msgid "Close"
 msgstr "Cores"
@@ -27092,7 +27352,7 @@ msgid "Delete this item"
 msgstr "Apagar este item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr ""
 
@@ -27105,8 +27365,8 @@ msgstr "Imprimir este item"
 msgid "Print this item"
 msgstr "Imprimir este item"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 #, fuzzy
 msgid "Save"
 msgstr "S�"
@@ -27133,9 +27393,9 @@ msgstr ""
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 #, fuzzy
 msgid "_File"
 msgstr "_Pasta"
@@ -27147,7 +27407,7 @@ msgstr "Imprimir..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 #, fuzzy
 msgid "Save _As..."
 msgstr "Gravar na _pasta..."
@@ -27163,8 +27423,8 @@ msgstr "Enviar mensagem em formato HTML"
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 #, fuzzy
 msgid "_Save"
 msgstr "S�"
@@ -27272,29 +27532,39 @@ msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
+msgid "Post New Message"
+msgstr "Criar uma nova mensagem"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
 msgid "Show message preview window"
 msgstr "Se uma previs�o da mensagem deve ser mostrada"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 #, fuzzy
 msgid "Virtual Folder _Editor..."
 msgstr "_Pastas"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 #, fuzzy
 msgid "_Filters..."
 msgstr "Dru�da dos _filtros"
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Preview Pane"
 msgstr "Prever impress�o"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Ir para a _pasta..."
@@ -27405,7 +27675,7 @@ msgstr "Enviar esta mensagem"
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -27686,204 +27956,219 @@ msgstr "Descartar esta mensagem?"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Responder"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Verificar novo correio"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Enviar a mensagem"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "Previous"
 msgstr "An_terior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Save the message as a text file"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
 msgid "Show Email _Source"
 msgstr "atalhos principais"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 #, fuzzy
 msgid "Show Full _Headers"
 msgstr "Novas mensagens de correio"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Show message in the normal style"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Show message with all email headers"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Show the raw email source of the message"
 msgstr "Anexar um ficheiro � mensagem"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "VFolder on Se_nder..."
 msgstr "Ficheiro n�o encontrado"
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 #, fuzzy
 msgid "_Forward Message"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir para"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Seg"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "Bip"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Message Display"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 #, fuzzy
 msgid "_Move to Folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 #, fuzzy
 msgid "_Normal Display"
 msgstr "Dia"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Open Message"
 msgstr "Mensagem de _correio"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Encontrar mensagens"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Nenhuma"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Abrir"
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 #, fuzzy
 msgid "_Undelete"
 msgstr "Apagar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 #, fuzzy
 msgid "Close this window"
 msgstr "Novo compromisso"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 #, fuzzy
 msgid "_Close"
 msgstr "Cores"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -27916,194 +28201,180 @@ msgstr ""
 msgid "For_mat"
 msgstr "F_ormato"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-#, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Anexar um ficheiro � mensagem"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 #, fuzzy
 msgid "Save As"
 msgstr "Guardar Calend�rio como"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Gravar na _pasta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 #, fuzzy
 msgid "Save the current file"
 msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Ficheiro com assinatura:"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:28
-#, fuzzy
-msgid "Send _Later"
-msgstr "Enviar"
-
-#: ui/evolution-message-composer.xml.h:29
-#, fuzzy
-msgid "Send _later"
-msgstr "Enviar"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Enviar mensagem em formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-#, fuzzy
-msgid "Send the message later"
-msgstr "Enviar a mensagem"
-
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
-msgid "Send this message now"
+msgid "Send this message"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Ver/esconder anexos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Ver _anexos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Show attachments"
 msgstr "Ver _anexos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Enviar esta mensagem"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "_Attachment..."
 msgstr "Adicionar anexo..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "_Delete all"
 msgstr "Apagar"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "_Abrir"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "Responder"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Ficheiro com assinatura:"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 #, fuzzy
 msgid "_Help"
 msgstr "Casa"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Ficheiro com assinatura:"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
@@ -28210,196 +28481,226 @@ msgid "Add to _Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Instala��o do Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "Copy this folder"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Create _New Folder..."
 msgstr "Criar um novo calend�rio"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 #, fuzzy
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Create a new folder"
 msgstr "Criar um novo calend�rio"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Criar um novo contacto"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Criar um novo calend�rio"
+
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Delete this folder"
 msgstr "Apagar este item"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Mostrar uma pasta diferente"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "E_xit"
 msgstr "Pr�_ximo"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Evolution _Window"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Move this folder to another place"
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Criar um novo calend�rio"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "Open in New Window"
 msgstr "�brir em nova janela"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Configura��o do co_rreio..."
+
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configura��o do correio"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 #, fuzzy
 msgid "Ximian Evolution _FAQ"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 #, fuzzy
 msgid "_About Ximian Evolution..."
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 #, fuzzy
 msgid "_Copy..."
 msgstr "Copiar"
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Folder Bar"
 msgstr "_Pasta"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Pasta"
+
+#: ui/evolution.xml.h:50
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "Seg"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 #, fuzzy
 msgid "_Move..."
 msgstr "Sg"
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 #, fuzzy
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "Configura��o do co_rreio..."
+msgid "_Preferences..."
+msgstr "Prefer�ncias"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Abrir"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 #, fuzzy
 msgid "_Send / Receive"
 msgstr "Receber"
 
-#: ui/evolution.xml.h:54
-#, fuzzy
-msgid "_Shortcut"
-msgstr "Mudar nome de atalho"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 #, fuzzy
 msgid "_Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "Mudar nome de atalho"
+
 #: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
@@ -28417,17 +28718,38 @@ msgstr "Encontrar mensagens"
 
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
-msgid "Address Cards"
-msgstr "Endere�o"
+msgid "By _Company"
+msgstr "Empresa"
 
 #: views/addressbook/galview.xml.h:2
 #, fuzzy
-msgid "By Company"
-msgstr "Empresa"
+msgid "_Address Cards"
+msgstr "Endere�o"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
+#, fuzzy
+msgid "_Phone List"
+msgstr "_Contacto"
+
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Semana"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "_Novo"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "M�s"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Semana"
 
 #: views/mail/galview.xml.h:1
 #, fuzzy
@@ -28458,13 +28780,19 @@ msgstr "Assunto"
 msgid "Messages"
 msgstr "Mensagem de _correio"
 
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
+msgstr "�cone_s pequenos"
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
 
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28622,12 +28950,12 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 #, fuzzy
 msgid "Search Editor"
 msgstr "_Contacto"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 #, fuzzy
 msgid "Save Search"
 msgstr "Ano"
@@ -28672,22 +29000,22 @@ msgstr "Mensagem de _correio"
 msgid "Don't show this message again."
 msgstr "Enviar esta mensagem"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Encontrar"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "Carro"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Find Now"
 msgstr "Encontrar"
@@ -28703,24 +29031,90 @@ msgstr "Adicionar Fonte"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 #, fuzzy
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 #, fuzzy
 msgid "init_corba(): could not initialize GNOME"
 msgstr "N�o se consegui inicializar Bonobo"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 #, fuzzy
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "N�o se consegui inicializar Bonobo"
 
 #, fuzzy
-#~ msgid "Addressbook Settings"
-#~ msgstr "Adicionar Fonte"
+#~ msgid "_Browse..."
+#~ msgstr "Sg"
+
+#, fuzzy
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Novo compromisso"
+
+#, fuzzy
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr "Assunto"
+
+#, fuzzy
+#~ msgid "Insert File"
+#~ msgstr "_Inserir"
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Empresa"
+
+#, fuzzy
+#~ msgid "Evolution News Editor"
+#~ msgstr "Atalho para _barra do Evolution"
+
+#, fuzzy
+#~ msgid "NNTP Server:"
+#~ msgstr "Servidor:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Fontes"
+
+#, fuzzy
+#~ msgid "Source"
+#~ msgstr "Fontes"
+
+#, fuzzy
+#~ msgid "Source Information"
+#~ msgstr "Nenhuma Informa��o"
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Encontrar mensagens"
+
+#, fuzzy
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "O Evolution n�o consegue criar as suas pastas locais"
+
+#, fuzzy
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Anexar um ficheiro � mensagem"
+
+#, fuzzy
+#~ msgid "Send _Later"
+#~ msgstr "Enviar"
+
+#, fuzzy
+#~ msgid "Send _later"
+#~ msgstr "Enviar"
+
+#, fuzzy
+#~ msgid "Send the message later"
+#~ msgstr "Enviar a mensagem"
+
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Configura��o do co_rreio..."
 
 #, fuzzy
 #~ msgid "Configuration control for the Evolution Addressbook."
@@ -28779,10 +29173,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Encontrar avan�ado"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Ficheiro com assinatura:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Ficheiro com assinatura:"
 
@@ -28907,14 +29297,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Telem�vel"
 
 #, fuzzy
-#~ msgid "Create a new appointment"
-#~ msgstr "Criar um novo compromisso para hoje"
-
-#, fuzzy
-#~ msgid "Create a new task"
-#~ msgstr "Criar um novo contacto"
-
-#, fuzzy
 #~ msgid "New _Task"
 #~ msgstr "_Tarefa"
 
@@ -28947,10 +29329,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Situa��o das mensagens"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Criar um novo calend�rio"
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "Mensagem de _correio"
 
@@ -28991,10 +29369,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Organiza��o:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "Mudar nome de atalho"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Enviar mensagem em formato HTML"
 
@@ -29585,10 +29959,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgstr "Reponder para todos"
 
 #, fuzzy
-#~ msgid "_Print Message"
-#~ msgstr "Encontrar mensagens"
-
-#, fuzzy
 #~ msgid "_Source"
 #~ msgstr "Fontes"
 
@@ -29664,9 +30034,6 @@ msgstr "N�o se consegui inicializar Bonobo"
 #~ msgid "Paste selected region into the clipboard"
 #~ msgstr "Colar a regi�o seleccionada para a �rea de transfer�ncia"
 
-#~ msgid "Composes a new mail message"
-#~ msgstr "Criar uma nova mensagem"
-
 #~ msgid "_Journal Entry"
 #~ msgstr "_Entrada di�ria?"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0ed542d24a..1d90f700d7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.4\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-04-04 08:35-0300\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -34,7 +34,7 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "File As"
 msgstr "Arquivar como"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nome"
@@ -342,46 +342,46 @@ msgstr "VCard para %s"
 msgid "Could not initialize Bonobo"
 msgstr "N�o foi poss�vel iniciar Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Carregando..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Erro na express�o de busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Adicionando cart�o ao servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Removendo cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modificando cart�o do servidor LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Reiniciando busca."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Recebendo resultados da busca LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Erro ao remover cart�o"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "N�o foi poss�vel analisar URL `%s'"
@@ -476,11 +476,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contatos"
 
@@ -496,23 +496,32 @@ msgstr "Servidor LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Servidor LDAP contendo informa��o sobre contatos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Novo contato"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Contato"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Criar novo contato"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nova lista de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "Lista de _contatos"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Novo contato"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Contato"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Criar nova lista de contatos"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -536,30 +545,30 @@ msgstr "N�o foi poss�vel analisar URL `%s'"
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Erro ao carregar infora��o do filtro:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL n�o � suportado nesta c�pia do Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "N�o foi poss�vel iniciar gnome-vfs"
 
@@ -567,11 +576,11 @@ msgstr "N�o foi poss�vel iniciar gnome-vfs"
 msgid "Other Contacts"
 msgstr "Outros contatos"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "N�o � poss�vel abrir o cat�logo de endere�os"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -581,7 +590,7 @@ msgstr ""
 "significa que voc� forneceu uma URI incorreta ou o servidor\n"
 "LDAP est� fora do ar"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -593,7 +602,7 @@ msgstr ""
 "voc� deve recompilar o programa dos fontes em CVS ap�s\n"
 "obter o OpenLDAP a partir do link abaixo.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,42 +611,42 @@ msgstr ""
 "Por favor, verifique se o arquivo existe e que voc�\n"
 "possui as permiss�es para acess�-lo."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Entre senha para %s (usu�rio %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Nome come�a com"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-mail �"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Categoria �"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo cont�m"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avan�ado..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "A URI que o navegador de pastas vai exibir"
 
@@ -759,7 +768,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Fontes de cat�logos de endere�os"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -856,8 +865,8 @@ msgstr "Configura��o"
 msgid "Mappings"
 msgstr "Margens"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "a _cada"
@@ -911,8 +920,8 @@ msgstr "_Escopo de busca:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Buscando"
 
@@ -1106,15 +1115,15 @@ msgid "Using email address"
 msgstr "Endere�o de e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Adicionar"
 
@@ -1161,12 +1170,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editar"
@@ -1282,10 +1291,10 @@ msgstr "F�brica para interface para sele��o de nomes do cat�logo de endere�os"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Remover"
 
@@ -1314,44 +1323,15 @@ msgstr "(%d n�o exibidos)"
 msgid "Unnamed Contact"
 msgstr "Contato sem nome"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Selecionar contatos do cat�lago de endere�os"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Remetente cont�m"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
-"Isto pode ter sido causado por uma falha no componente evolution-"
-"addressbook.\n"
-"Para nos ajudar a entender melhor este problema e finalmente resolv�-lo,\n"
-"por favor envie um e-mail para Jon Trowbridge <trow@ximian.com> com uma\n"
-"descri��o detalhada das circunst�ncias sob as quais este erro ocorreu.\n"
-"Obrigado."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
-"Sob circunst�ncias normais isso nunca deveria acontecer.\n"
-"Voc� pode precisar sair e reiniciar o Evolution para corrigir\n"
-"este problema."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Selecionar contatos do cat�lago de endere�os"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Selecionar nomes"
@@ -1373,15 +1353,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Mover..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Pasta:"
 
@@ -1487,11 +1462,12 @@ msgstr "Deseja receber correio _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Excluir"
 
@@ -2730,7 +2706,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Esconder endere�os ao enviar correio a esta lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -2793,7 +2769,7 @@ msgstr ""
 "pasta. Voc� deseja adicion�-lo mesmo assim?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Busca avan�ada"
 
@@ -2820,21 +2796,21 @@ msgid "Error getting book view"
 msgstr "Erro ao obter vis�o de livro"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Erro ao modificar cart�o"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Sucesso"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2842,8 +2818,8 @@ msgstr "Erro desconhecido"
 msgid "Repository offline"
 msgstr "Reposit�rio off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Permiss�o negada"
 
@@ -2860,7 +2836,7 @@ msgid "Protocol not supported"
 msgstr "Protocolo n�o suportado"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2883,48 +2859,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Arquivo %s n�o existe"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Voc� deseja salvar as modifica��es?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Erro ao adicionar cart�o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Erro ao remover cart�o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Exibi��o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Exibi��o"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2932,22 +2913,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Copiar tarefa selecionada"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Sem cart�es"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Sem cart�es"
@@ -3020,7 +3001,7 @@ msgstr "Cat�logo de endere�os"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salvar como VCard"
 
@@ -3060,7 +3041,7 @@ msgid "Pilot Settings..."
 msgstr "Configura��es do _pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
@@ -3069,8 +3050,8 @@ msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Imprimir"
@@ -3090,7 +3071,7 @@ msgid "Move to folder..."
 msgstr "_Mover para pasta..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
@@ -3101,20 +3082,20 @@ msgid "Copy"
 msgstr "Copiar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Excluir"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Vis�o atual"
@@ -3283,7 +3264,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Op��es"
 
@@ -3373,26 +3354,26 @@ msgstr "Compromisso sem nome"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Alta"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Indefinido"
@@ -3514,11 +3495,11 @@ msgstr "Tempo de adiamento (minutos)"
 msgid "_Edit appointment"
 msgstr "_Editar compromisso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Sem descri��o dispon�vel."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3530,13 +3511,13 @@ msgstr ""
 "com notifica��es por e-mail. O Evolution exibir�\n"
 "no lugar uma caixa de di�logo de lembrete normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Alerta"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3553,7 +3534,7 @@ msgstr ""
 "\n"
 "Voc� tem certeza que deseja executar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "N�o me pergunte novamente."
@@ -3582,7 +3563,7 @@ msgstr "Descri��o cont�m"
 msgid "Comment contains"
 msgstr "Coment�rio cont�m"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "N�o casadas"
 
@@ -3593,7 +3574,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3615,19 +3596,19 @@ msgstr "%d de %B de %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "N�o foi poss�vel criar a vis�o da agenda. Por favor verifique a configura��o "
 "do seu ORBit e OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Particular"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3652,37 +3633,37 @@ msgstr "L"
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Livre"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupado"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "N�o iniciada"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Em progresso"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Conclu�da"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3693,56 +3674,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Atribuido"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Sim"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "N�o"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Vis�o de dia"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Vis�o de semana �til"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Vis�o de semana"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Vis�o de m�s"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3750,12 +3730,12 @@ msgstr "Agenda"
 msgid "Folder containing appointments and events"
 msgstr "Pasta contendo compromissos e eventos"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -3763,44 +3743,62 @@ msgstr "Tarefas"
 msgid "Folder containing to-do items"
 msgstr "Pasta contendo itens de tarefa"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Novo compromisso"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Compromisso"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Criar um novo compromisso"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Configura��es de fontes de not�cias"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Reuni�o"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Criar uma nova tarefa"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Novo compromisso"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Compromisso"
+msgid "Create a new all-day appointment"
+msgstr "Criar um novo compromisso"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3868,7 +3866,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dias"
 
@@ -3876,11 +3875,13 @@ msgstr "dias"
 msgid "extra times every"
 msgstr "vezes extra a cada"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutos"
 
@@ -4008,7 +4009,7 @@ msgstr "Lembretes"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4037,7 +4038,7 @@ msgstr "fim do compromisso"
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4215,7 +4216,7 @@ msgid "_Fri"
 msgstr "Se_x"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Geral"
 
@@ -4260,19 +4261,33 @@ msgstr "Qu_a"
 msgid "before every appointment"
 msgstr "antes do in�cio do compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "O estado da reuni�o mudou. Enviar uma vers�o atualizada?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Voc� tem certeza que deseja cancelar e excluir esta reuni�o?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Voc� tem certeza que deseja cancelar e excluir esta tarefa?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Voc� tem certeza que deseja cancelar e excluir este item de di�rio?"
 
@@ -4341,61 +4356,61 @@ msgstr " (Prazo "
 msgid "Due "
 msgstr "Prazo "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "N�o foi poss�vel atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "N�o foi poss�vel atualizar objeto!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de di�rio - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "N�o foi poss�vel obter a vers�o atual!"
 
@@ -4594,7 +4609,7 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4606,7 +4621,7 @@ msgstr "Papel"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
@@ -4691,7 +4706,7 @@ msgstr "no"
 msgid "first"
 msgstr "lista"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "segundo"
 
@@ -4715,7 +4730,7 @@ msgstr "lista"
 msgid "Other Date"
 msgstr "Outro fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dia"
 
@@ -4815,20 +4830,26 @@ msgstr "% Conclu�da"
 msgid "Date Completed:"
 msgstr "Conclu�da em:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Necessita a��o"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Progresso"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Estado:"
 
@@ -4842,7 +4863,7 @@ msgstr "B�sico"
 msgid "Assignment"
 msgstr "Atribui��o"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4911,80 +4932,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Marcar como conclu�da"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas como conclu�das"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -4993,8 +5014,8 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "Alarms"
 msgstr "Alarmes"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Conclu�da"
 
@@ -5022,11 +5043,9 @@ msgstr "Prioridade"
 msgid "Start Date"
 msgstr "Data de in�cio"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Resumo"
 
@@ -5068,111 +5087,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Novo _compromisso"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Reuni�o"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informa��o de livre/ocupado"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configura��o"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configura��o"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Salvar _como..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reuni�o"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Encaminar como i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Tornar esta ocorr�ncia _m�vel"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Excluir esta _ocorr�ncia"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Excluir _todas as ocorr�ncias"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "As ferramentas do GNOME Pilot n�o aparentam estar instaladas no seu sistema."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
@@ -5213,7 +5231,7 @@ msgstr "Tarefa conclu�da: <b>"
 msgid "Task Due: <b>"
 msgstr "Tarefa para: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Informa��o de iCalendar"
 
@@ -5222,12 +5240,12 @@ msgstr "Informa��o de iCalendar"
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Uma raz�o desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5235,323 +5253,328 @@ msgstr ""
 "<br> Por favor veja a seguinte informa��o e ent�o selecione uma a��o do menu "
 "abaixo."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Local:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Estado:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Escolher uma a��o:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Atualizar"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Enviar informa��o de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Enviar informa��o mais recente"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informa��o de reuni�o."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informa��o de reuni�o"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requisita a sua presen�a em uma reuni�o."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Proposta de reuni�o"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicion�-lo a uma reuni�o existente."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Atualiza��o de reuni�o"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a informa��o de reuni�o mais recente."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualiza��o de reuni�o"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reuni�o."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Resposta a reuni�o"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou a reuni�o."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reuni�o"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem incompreens�vel."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reuni�o inv�lida"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informa��o de tarefa."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informa��o de tarefa"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requisita que voc� execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja acrescent�-lo a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Atualiza��o de tarefa"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a informa��o de tarefa mais recente."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Pedido de atualiza��o de tarefa"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribui��o de tarefa."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inv�lida"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informa��o de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informa��o de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requisita sua informa��o de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inv�lida"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem n�o aparenta estar formada corretamente."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem cont�m apenas pedidos n�o suportados."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo n�o cont�m uma mensagem de agenda v�lida"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo n�o cont�m itens visualiz�veis de agenda"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "O item n�o p�de ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Atualiza��o conclu�da\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "O arquivo de agenda n�o p�de ser atualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante n�o p�de ser atualizado pois o item n�o existe mais"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta n�o � de um participante atual. Adicion�-lo como participante?"
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante n�o p�de ser atualizado devido a um estado inv�lido!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado do participante n�o p�de ser atualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Remo��o conclu�da"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "O item n�o p�de ser enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Selecionar pasta"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Selecionar pasta"
@@ -5597,7 +5620,7 @@ msgstr "data-inicio"
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Participantes obrigat�rios"
 
@@ -5610,57 +5633,52 @@ msgid "Non-Participants"
 msgstr "N�o participantes"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Indiv�duo"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupo"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Recurso"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Sala"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Moderador"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Participante obrigat�rio"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "N�o participante"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Necessita a��o"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Preliminar"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5750,49 +5768,46 @@ msgstr "Hora de _in�cio da reuni�o:"
 msgid "Meeting _end time:"
 msgstr "Hora de _t�rmino da reuni�o:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "N�o foi poss�vel carregar as tarefas em `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "O m�todo necess�rio para carregar `%s' n�o � suportado"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "N�o foi poss�vel abrir pasta em `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data de conclus�o"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Excluindo permanentemente pasta"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Excluir este compromisso"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5803,11 +5818,16 @@ msgstr "N�o foi poss�vel abrir pasta em `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "O m�todo necess�rio para abrir `%s' n�o � suportado"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abrindo agenda em %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Abrindo pasta %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -5864,51 +5884,56 @@ msgstr "Outubro"
 msgid "September"
 msgstr "Setembro"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Pelo menos um participante � necess�rio"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Um organizador deve ser configurado."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Informa��o de evento"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informa��o de tarefa"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informa��o de di�rio"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Informa��o de livre/ocupado"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informa��o de agenda"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Atualizado"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Contra proposta"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Voc� deve ser um participante do evento."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "N�o foi poss�vel iniciar Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "N�o foi poss�vel criar a f�brica de editor de componentes"
 
@@ -6135,9 +6160,8 @@ msgid "Print Calendar"
 msgstr "Imprimir agenda"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Visualizar impress�o"
 
@@ -6174,8 +6198,8 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "N�o me pergunte novamente."
 
@@ -6241,17 +6265,29 @@ msgstr "Importa arquivos VCard no Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importa arquivos VCard no Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"N�o � poss�vel obter mensagem: %s da pasta %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "N�o foi poss�vel conectar ao reposit�rio: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Lembrete"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mensagem de agenda"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6260,84 +6296,84 @@ msgstr ""
 "O Evolution achou arquivos de correio do Pine.\n"
 "Voc� gostaria de import�-los no Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Agenda"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now espera 0 argumentos"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time espera 1 argumento"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time espera que o argumento 1 seja uma string"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "O argumento 1 de make-time deve ser uma string de data ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day espera 2 argumentos"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day espera que o argumento 1 seja um time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day espera que o argumento 2 seja um inteiro"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin espera 1 argumento"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin espera que o argument 1 seja um time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end espera 1 argumento"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end espera que o argument 1 seja um time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype espera 0 argumentos"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? espera 2 argumentos"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? espera que o argument 1 seja um time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? espera que o argument 2 seja um time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? espera 2 argumentos"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? espera que o argument 1 seja uma string"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? espera que o argument 2 seja uma string"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6345,11 +6381,11 @@ msgstr ""
 "contains? espera que o argument 1 seja um de \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? espera pelo menos 1 argumento"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6357,19 +6393,19 @@ msgstr ""
 "has-categories? espera que todos os argumentos sejam strings ou somente um "
 "argumento que seja o falso booleano (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? espera 0 argumentos"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? espera 1 argumento"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? espera que o argumento 1 seja um time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Avalia��o da express�o de busca n�o forneceu um valor booleano"
 
@@ -7969,72 +8005,82 @@ msgstr "Armazenando pasta '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Voc� deve estar trabalhando conectado para completar esta opera��o"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "N�o � poss�vel abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "N�o � poss�vel processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Falhou a decodifica��o da mensagem."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Argumentos inv�lidos"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Argumentos inv�lidos"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Falhou a cria��o de cache para mensagem %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Falhou a cria��o de cache para mensagem %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar busca por filtro: %s: %s"
@@ -8090,7 +8136,7 @@ msgstr "Movendo mensagens"
 msgid "Copying messages"
 msgstr "Copiando mensagens para %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8098,47 +8144,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor POP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "N�o foi fornecido um nome de arquivo."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "N�o � poss�vel cifrar esta mensagem: n�o foram definidos destinat�rios"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8146,18 +8192,18 @@ msgid ""
 "%.*s"
 msgstr "Falhou a cria��o de cache para mensagem %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Falhou a cria��o de cache para mensagem %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Falhou a decodifica��o da mensagem."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8185,24 +8231,24 @@ msgid "Could not lock '%s'"
 msgstr "N�o foi poss�vel bloquear '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "N�o foi poss�vel criar arquivo de bloqueio para %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Tempo esgotado ao tentar obter arquivo de bloqueio em %s. Tente novamente "
 "mais tarde."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Falha ao obter bloqueio usando fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Falha ao obter bloqueio usando flock(2): %s"
@@ -8261,11 +8307,15 @@ msgstr "Erro ao escrever arquivo de correio tempor�rio: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Erro ao copiar arquivo de correio tempor�rio: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8401,7 +8451,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
@@ -8575,31 +8625,134 @@ msgstr "N�o � poss�vel obter pasta: Opera��o inv�lida neste reposit�rio"
 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-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Falhou a verifica��o dos certificados."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Falhou a verifica��o dos certificados."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Arquivo de assinatura:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Erro ao carregar %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Fora do escrit�rio"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
 msgstr ""
-"Certificado inv�lido de %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Voc� deseja aceit�-lo mesmo assim?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Falhou a verifica��o dos certificados."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Argumento inv�lido"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_ID do certificado:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8608,16 +8761,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Certificado inv�lido de %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Voc� deseja aceit�-lo mesmo assim?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8637,32 +8807,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "N�o foi poss�vel analisar URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Erro ao iniciar %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "N�o existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "N�o � poss�vel excluir pasta: %s: Opera��o inv�lida"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, 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:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "N�o � poss�vel renomear pasta: %s: N�o existe tal pasta"
@@ -8670,12 +8845,12 @@ msgstr "N�o � poss�vel renomear pasta: %s: N�o existe tal pasta"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Opera��o cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente: %s"
@@ -8704,40 +8879,40 @@ msgstr "Resposta do servidor IMAP n�o cont�m informa��o de %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "N�o foi poss�vel criar o diret�rio %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "N�o foi poss�vel carregar resumo para %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "A pasta foi destru�da e recriada no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Procurando mensagens alteradas"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Esta mensagem n�o est� dispon�vel no momento"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informa��o de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Procurando novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta FETCH."
 
@@ -8746,10 +8921,10 @@ msgstr "N�o foi poss�vel localizar corpo da mensagem na resposta FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "N�o foi poss�vel abrir o diret�rio cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Falhou a cria��o de cache para mensagem %s: %s"
@@ -8762,7 +8937,7 @@ msgstr "Verificando novas mensagens"
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagem em todas as pastas"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Pastas"
 
@@ -8792,7 +8967,7 @@ msgstr "Para ler e armazenar correio em servidores IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Senha"
 
@@ -8800,73 +8975,77 @@ msgstr "Senha"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Esta op��o conectar� ao servidor IMAP usando uma senha em texto claro."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s servi�o para %s em %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conex�o cancelada"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 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:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usu�rio: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Opera��o n�o suportada"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Falhou a autentica��o."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "A pasta n�o est� vazia"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, 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:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Voc� n�o entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8877,31 +9056,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "N�o existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "O nome da pasta n�o pode conter o caractere Return."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai n�o pode conter sub-pastas"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "N�o � poss�vel abrir mbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8923,7 +9108,10 @@ msgid "Local delivery"
 msgstr "Entrega local"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Para recuperar correio local de filas no formato padr�o mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8951,12 +9139,12 @@ msgstr "Filas mbox padr�o do Unix"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Para ler e armazenar correio local em arquivos de fila mbox padr�o."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8967,38 +9155,38 @@ msgstr "Raiz de armazenagem %s n�o � um caminho absoluto"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "N�o � poss�vel obter pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 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:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Arquivo de correio local %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "N�o foi poss�vel renomear pasta: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, 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"
@@ -9058,7 +9246,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9096,26 +9284,26 @@ msgstr "n�o � um diret�rio maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "N�o foi poss�vel varrer pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "N�o � poss�vel abrir diret�rio maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Verificando novas mensagens"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Procurando novas mensagens"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Armazenando pasta"
@@ -9159,7 +9347,7 @@ msgstr "A pasta aparenta estar corrompida de modo irrecuper�vel."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Falha ao construir a mensagem: mbox corrompida?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9168,7 +9356,7 @@ msgstr ""
 "N�o foi poss�vel abrir arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9177,14 +9365,14 @@ msgstr ""
 "N�o foi poss�vel criar arquivo `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' n�o � um arquivo comum."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9193,7 +9381,7 @@ msgstr ""
 "N�o foi poss�vel excluir pasta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' n�o est� vazia. Ela n�o foi exclu�da."
@@ -9208,64 +9396,64 @@ msgstr "N�o foi poss�vel abrir pasta: %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "N�o � poss�vel checar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "N�o � poss�vel abrir mbox tempor�rio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "N�o foi poss�vel renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro desconhecido: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "N�o foi poss�vel renomear pasta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro ao escrever para o mbox tempor�rio: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Falha ao escrever para o mbox tempor�rio: %s: %s"
@@ -9416,50 +9604,50 @@ msgstr "Cancelar"
 msgid "Operation failed: %s"
 msgstr "Opera��o cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Recuperando resumo POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Opera��o cancelada"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "N�o � poss�vel obter pasta: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Excluindo permanentemente mensagens exclu�das"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "N�o existe mensagem com uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recuperando mensagem POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "N�o � poss�vel obter mensagem: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipita��o desconhecida"
@@ -9477,7 +9665,7 @@ msgstr "Deixar mensagens no servidor"
 msgid "Delete after %s day(s)"
 msgstr "Excluir ap�s %s dia(s)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9503,6 +9691,11 @@ msgstr ""
 "protocolo APOP. Isto pode n�o funcionar para todos os usu�rios mesmo em "
 "servidores que alegam suportar o protocolo."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "N�o foi poss�vel conectar � %s (porta %d): %s."
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9514,54 +9707,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "N�o foi poss�vel conectar ao servidor POP em %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "N�o existe suporte para o mecanismo de autentica��o pedido."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Falhou o comando IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Erro de E/S"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "N�o foi poss�vel autenticar o servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sPor favor entre a senha POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 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:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9591,35 +9786,35 @@ msgstr ""
 "N�o foi poss�vel executar fork para o sendmail: %s: a mensagem n�o foi "
 "enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "N�o foi poss�vel enviar a mensagem: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail terminou com sinal %s: a mensagem n�o foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "N�o foi poss�vel executar %s: a mensagem n�o foi enviada"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail terminou com estado %d: a mensagem n�o foi enviada."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9727,45 +9922,45 @@ msgstr "Falha de autentica��o tempor�ria"
 msgid "Authentication required"
 msgstr "Autentica��o exigida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Erro na resposta de boas-vindas: %s: possivelmente n�o-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "N�o � poss�vel conectar ao servidor POP.\n"
 "Erro ao enviar nome do usu�rio: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "A mensagem n�o aparenta estar formada corretamente."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "O servidor SMTP %s n�o suporta o mecanismo de autentica��o pedido %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sPor favor entre a senha SMTP para %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9776,90 +9971,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "N�o � poss�vel enviar mensagem: n�o foram definidos destinat�rios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "N�o � poss�vel enviar mensagem: n�o foram definidos destinat�rios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Sauda��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Tempo excedido no pedido HELO: %s: n�o-fatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Erro na resposta de HELO: %s: n�o-fatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Erro na resposta de RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Autentica��o SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autentica��o SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Falhou o pedido AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autentica��o inv�lida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Erro na resposta de MAIL FROM: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido RCPT TO: %s: a mensagem n�o foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
@@ -9867,92 +10062,92 @@ msgstr "Tempo excedido no pedido DATA: %s: a mensagem n�o foi enviada"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tempo excedido no envio de DATA: termina��o de mensagem: %s: a mensagem n�o "
 "foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Resposta de autentica��o inv�lida do servidor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tempo excedido no pedido RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Tempo excedido no pedido QUIT: %s: n�o-fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Tempo excedido no pedido AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Erro na resposta de RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo � mensagem"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "N�o � poss�vel anexar arquivo %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "N�o � poss�vel anexar arquivo %s: n�o � um arquivo comum"
@@ -9970,56 +10165,60 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibi��o autom�tica de anexo"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Clique aqui para o cat�logo de endere�os"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "De:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Responder-a:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "De:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Entre os destinat�rios da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endere�os que receber�o uma c�pia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10027,17 +10226,25 @@ msgstr ""
 "Entre os endere�os que receber�o uma c�pia da mensagem sem aparecer na lista "
 "de destinat�rios da mensagem"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "N�o foi poss�vel criar um contexto de assinatura PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10046,34 +10253,34 @@ msgstr ""
 "Erro ao ler arquivo %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Alerta!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Arquivo existe, sobrescrever?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro ao salvar arquivo: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro ao carregar arquivo: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Erro ao acessar arquivo: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "N�o foi poss�vel recuperar mensagem do editor"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10082,7 +10289,7 @@ msgstr ""
 "N�o � poss�vel buscar no arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10091,7 +10298,7 @@ msgstr ""
 "N�o � poss�vel truncar arquivo: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10100,7 +10307,7 @@ msgstr ""
 "Erro ao salvar automaticamente mensagem: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10108,7 +10315,7 @@ msgstr ""
 "O Ximian Evolution encontrou arquivos n�o salvos de uma sess�o anterior.\n"
 "Voc� gostaria de tentar recuper�-los?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10118,43 +10325,39 @@ msgstr ""
 "\n"
 "Voc� deseja salvar as suas modifica��es?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Inserir arquivo"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Salvar assinatura"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (padr�o)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Redigir uma mensagem"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10162,7 +10365,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:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10170,9 +10373,10 @@ 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:3665
+#: composer/e-msg-composer.c:3846
+#, fuzzy
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(O redator cont�m um corpo de mensagem n�o texto, o qual n�o pode ser "
@@ -10238,8 +10442,8 @@ msgstr "Assunto cont�m"
 msgid "Subject does not contain"
 msgstr "Assunto n�o cont�m"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10247,12 +10451,11 @@ msgstr ""
 "J� existe um arquivo com este nome.\n"
 "Sobrescrev�-lo?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Lembrar esta senha"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Lembrar esta senha pelo restante desta sess�o"
 
@@ -10351,150 +10554,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "ano"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "anos"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "segundos"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "m�s"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuto"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "meses"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hora"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "semana"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "semanas"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "hora"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "m�s"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuto"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "meses"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "segundos"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "ano"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "anos"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Voc� esqueceu de escolher uma data."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Voc� escolheu uma data inv�lida."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"A data da mensagem ser� comparada em rela��o\n"
-"ao instante quando o filtro � executado ou\n"
-"a pasta virtual � aberta."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"A data da mensagem ser� comparada em rela��o\n"
-"ao instante que voc� especificou aqui."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"A data da mensagem ser� comparada em rela��o a um\n"
-"instante relativo a quando o filtro � executado;\n"
-"\"uma semana atr�s\", por exemplo."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "o instante atual"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "um instante especificado"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "um instante relativo ao instante atual"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Selecionar um instante em rela��o ao qual comparar"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Comparar em rela��o a"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<clique aqui para selecionar uma data>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "agora"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " atr�s"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "atr�s"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %k:%M"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " atr�s"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<clique aqui para selecionar uma data>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Selecionar um instante em rela��o ao qual comparar"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Regras de filtro"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nome do estilo:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fila `%s' n�o existe ou n�o � um arquivo comum"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolher uma a��o:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Ent�o"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Adicionar a��o"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10502,12 +10655,12 @@ msgstr ""
 "Voc� esqueceu de escolher uma pasta.\n"
 "Por favor volte e especifique uma pasta v�lida para onde entregar correio."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10516,92 +10669,168 @@ msgstr ""
 "Erro na express�o regular '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Importante"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "ap�s"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Teste"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Voc� deve nomear este filtro."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Sem t�tulo"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Executar a��es"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "se todos os crit�rios forem atendidos"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "se algum crit�rio for atendido"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Adicionar crit�rio"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "de entrada"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "de sa�da"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Comparar em rela��o a"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editar filtros"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editar pastas virtuais"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "De entrada"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "De sa�da"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensagem ser� comparada em rela��o\n"
+"ao instante que voc� especificou aqui."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensagem ser� comparada em rela��o a um\n"
+"instante relativo a quando o filtro � executado;\n"
+"\"uma semana atr�s\", por exemplo."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensagem ser� comparada em rela��o\n"
+"ao instante que voc� especificou aqui."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Pastas virtuais"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "um instante relativo ao instante atual"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "atr�s"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "apenas pastas espec�ficas"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "o instante atual"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "um instante especificado"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Fontes de pastas virtuais"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "com todas as pastas remotas ativas"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "com todas as pastas locais e remotas ativas"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "com todas as pastas locais"
 
@@ -10629,42 +10858,42 @@ msgid "Beep"
 msgstr "Bel�m"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Empresa"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "cont�m"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiar para pasta"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recebimento"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Data de envio"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Exclu�da"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "n�o cont�m"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "n�o termina com"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "n�o existe"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "n�o existe"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "n�o soa como"
@@ -10686,93 +10915,89 @@ msgid "ends with"
 msgstr "termina com"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existe"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Express�o"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Importante"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "foi ap�s"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "foi antes"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "� maior que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "� menor que"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "n�o �"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcada"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de discuss�o"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corpo da mensagem"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Cabe�alho da mensagem"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mover para pasta"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Enviar mensagem ao contato"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Tocar um som:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Lida"
 
@@ -10788,57 +11013,87 @@ msgstr "Casamento com express�o regular"
 msgid "Replied to"
 msgstr "Em resposta a"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "� maior que"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "� menor que"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontua��o"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Remetente"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Atribuir estado"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Empresa"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamanho (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "soa como"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Conta fonte"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Cabe�alho espec�fico"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "come�a com"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Assunto"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Atribuir estado"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regras"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Adicionar regra"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Editar regra"
 
@@ -10846,11 +11101,11 @@ msgstr "Editar regra"
 msgid "Score Rules"
 msgstr "Regras de pontua��o"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Voc� deve nomear esta pasta virtual."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Voc� precisa especificar pelo menos uma pasta como uma fonte."
 
@@ -10858,31 +11113,31 @@ msgstr "Voc� precisa especificar pelo menos uma pasta como uma fonte."
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution est� importando seu correio antigo Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importando..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importando %s como %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Correio"
 
@@ -10943,39 +11198,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "O Evolution est� importando seus dados antigos do Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Lixeira"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Arquivo de correio local %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Varrendo diret�rio"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Iniciando a importa��o"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Configura��es"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar filtros"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11056,12 +11311,12 @@ msgstr "F�brica para o componente resumo executivo."
 msgid "Font Preferences"
 msgstr "Configura��es do resumo"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11109,7 +11364,7 @@ msgstr "Propriedades..."
 msgid "Change this folder's properties"
 msgstr "Modificar as propriedades desta pasta"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11117,60 +11372,80 @@ msgstr ""
 "Algumas de suas configura��es de correio aparentam estar corrompidas, por "
 "favor verifique se tudo est� em ordem."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Voc� n�o estabeleceu um m�todo de transporte de correio"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Alerta: Mensagem modificada"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Redigir uma mensagem"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Nova mensagem"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Mensagem anterior"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nova mensagem de correio"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "N�o � poss�vel iniciar o componente de correio do Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr ""
 "N�o � poss�vel iniciar o componente de configura��o de correio do Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "N�o � poss�vel iniciar o componente de informa��o de pasta do Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectando ao servidor..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "N�o � poss�vel registrar reposit�rio com a shell."
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriedades para \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propriedades"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
@@ -11220,135 +11495,135 @@ msgstr "%d total"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da mensagem"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _busca"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinat�rios"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discuss�o"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtro por _assunto"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtro por _remetente"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtro por _destinat�rios"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtro por _lista de discuss�o"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Res_ponder ao remetente"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Encaminhar"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Conclu�da"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _n�o lida"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar como _sem import�ncia"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Des_fazer exclus�o"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover para pasta..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao cat�logo de endere�os"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar filtros"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Pasta virtual por lista de discuss�o"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtro por lista de discuss�o (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Pasta virtual por lista de discuss�o (%s)"
@@ -11412,76 +11687,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor de not�cias do Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de contas do Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_M�quina:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome do _usu�rio:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Caminho:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Voc� n�o pode criar duas contas com o mesmo nome."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Voc� tem certeza que deseja excluir esta conta?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "N�o excluir"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Excluir conta mesmo?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Desativar"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Ativar"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Voc� tem certeza que deseja excluir esta conta de not�cias?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Ativado"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da _conta:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
@@ -11491,30 +11757,30 @@ msgstr "Porto Rico"
 msgid "Mail to %s"
 msgstr "Correio para %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Assunto � %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Correio de %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de discuss�o %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11526,7 +11792,7 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11538,7 +11804,7 @@ msgstr ""
 "receber ou redigir mensagens.\n"
 "Voc� desejaria configur�-lo agora?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11546,7 +11812,7 @@ msgstr ""
 "Voc� deve configurar uma identidade\n"
 "antes de poder redigir uma mensagem."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11555,7 +11821,7 @@ msgstr ""
 "antes de poder redigir uma mensagem."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11563,11 +11829,11 @@ msgstr ""
 "Voc� est� enviando uma mensagem em formato HTML, mas os seguintes "
 "destinat�rios n�o desejam correio em formato HTML:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11575,7 +11841,7 @@ msgstr ""
 "Esta mensagem n�o possui um assunto.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11584,11 +11850,11 @@ msgstr ""
 "est� configurada para esconder os endere�os da lista, esta mensagem conter� "
 "apenas destinat�rios Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Esta mensagem cont�m apenas destinat�rios Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11598,15 +11864,11 @@ msgstr ""
 "cabe�alho Apparently-To.\n"
 "Enviar mesmo assim?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Voc� deve especificar destinat�rios para poder enviar esta mensagem."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Voc� deve configurar uma conta antes de poder enviar esta mensagem."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11614,28 +11876,28 @@ msgstr ""
 "N�o � poss�vel abrir a pasta de rascunhos para esta conta.\n"
 "Voc� gostaria de usar a pasta de rascunhos padr�o?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d �s %H:%M, %%s escreveu:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mover mensagem(ns) para"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiar mensagem(ns) para"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Voc� tem certeza que deseja editar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11643,7 +11905,7 @@ msgstr ""
 "Voc� pode apenas editar mensagens salvas\n"
 "na pasta Rascunho."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11651,39 +11913,39 @@ msgstr ""
 "Voc� pode apenas reenviar mensagens\n"
 "na pasta Enviada."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Voc� tem certeza que deseja reenviar todas as %d mensagens?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "N�o existe mensagem selecionada"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Sobrescrever arquivo?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Salvar mensagem como..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Salvar mensagens como..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Exibir a pr�xima mensagem n�o lida"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11696,7 +11958,7 @@ msgstr ""
 "\n"
 "Apagar estas mensagens mesmo assim?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11705,28 +11967,28 @@ msgstr ""
 "Erro ao carregar infora��o do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "Carta-US"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Falhou a impress�o da mensagem"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11748,7 +12010,7 @@ msgstr "_Seguran�a"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contato sem nome"
@@ -11769,20 +12031,21 @@ msgid "Add Signature"
 msgstr "Salvar assinatura"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Por favor entre seu nome e endere�o de e-mail abaixo. Os campos opcionais "
 "abaixo n�o precisam ser preenchidos,\n"
 "a n�o ser que voc� deseje incluir esta informa��o mas mensagens enviadas."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Por favor entre abaixo informa��o sobre o seu servidor de entrada de "
 "correio. Se voc� n�o tiver certeza, \n"
@@ -11793,24 +12056,23 @@ msgid "Please select among the following options"
 msgstr "Por favor selecione entre as seguintes op��es"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Por favor entre informa��o sobre como voc� enviar� correio. Se voc� n�o "
 "tiver certeza, pergunte ao seu\n"
 "administrador de sistema ou a seu provedor de Internet."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Voc� est� quase terminando o processo de configura��o de correio. A "
 "identidade, o servidor de entrada de correio\n"
@@ -11821,44 +12083,20 @@ msgstr ""
 "Este nome ser� usado apenas para prop�sitos de exibi��o."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "ap�s"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Conta"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Verificando servi�o"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
@@ -12123,241 +12361,229 @@ msgstr "Salvar e fechar"
 msgid "Loading Images"
 msgstr "Carregar _imagens"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Localiza��o da caixa de correio"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Mensagens"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Exibi��o de _mensagem"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Micron�sia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Servidor NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configura��o de correio"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Fontes de not�cias"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informa��o opcional"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da chave _PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Imprimir contatos selecionados"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "N�o � poss�vel abrir mensagem"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-a:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Op��es de recep��o"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Lembrar esta senha"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Informa��o exigida"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr " (padr�o)"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Seguran�a"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Secure MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecionar execut�vel PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Pasta de mensagens _enviadas:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Mensagens enviadas e rascunhos"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Servidor requer _autentica��o"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configura��o do servidor"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Tipo do _servidor: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Atalhos"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Salvar assinatura"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Fonte"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informa��o da fonte"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Mbox padr�o do Unix"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Vari�vel"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12367,205 +12593,201 @@ msgstr ""
 "\n"
 "Pressione \"Pr�ximo\" para come�ar. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Leste"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Sempre carregar imagens da rede"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Sempre a_ssinar mensagens enviadas usando esta conta"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Tipo de autentica��o: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Verificar automaticamente novas mensagens"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_ID do certificado:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Confirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Assinatura _HTML:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Padr�o"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Ativar"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Estilo de encaminhamento padr�o �: "
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nome _completo:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Em correio HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identidade"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Carregar imagens se o remetente est� no cat�logo de endere�os"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Torne esta a minha conta _padr�o"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas ap�s"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nunca carregar imagens da rede"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Arquivo execut�vel _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Perguntar ao enviar mensagens HTML para contatos que n�o as querem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Perguntar ao enviar mensagens com um assunto _vazio"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Recebendo correio"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Estilo de encaminhamento padr�o �: "
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (padr�o)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguran�a"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Seguran�a"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Enviando correio"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Exibir como tempo"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Arquivo de assinatura:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Usar conex�o se_gura (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Vari�vel"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "a _cada"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "descri��o"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12589,203 +12811,213 @@ msgstr "N�o foi poss�vel criar um contexto de envelope S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "N�o foi poss�vel criar um contexto de decodifica��o S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Salvar anexo"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "N�o foi poss�vel criar diret�rio tempor�rio: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Salvar para o disco..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Salvar anexo"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Ver embutido"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver embutido (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Esconder"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Visualizador externo"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Carregar _imagens"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Carregando conte�do da mensagem"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Tarefas _atrasadas:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %k:%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Abrir v�nculo no navegador"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copiar local do v�nculo"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Salvar v�nculo como (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "N�o foi poss�vel analisar mensagem MIME. Exibindo como fonte."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Endere�o inv�lido"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Responder-a"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Correio"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Salvar mensagem como..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Esta mensagem est� assinada digitalmente. Clique no cadeado para mais "
 "informa��es."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "N�o foi poss�vel criar um contexto de verifica��o PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Esta mensagem est� assinada digitalmente e � aut�ntica."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Esta mensagem est� assinada digitalmente mas n�o � poss�vel estabelecer sua "
 "autenticidade."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) v�lido no site \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Pastas locais"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Reconfigurando pasta"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "N�o � poss�vel salvar metainfo; voc� provavelmente descobrir� que\n"
 "n�o pode mais abrir esta pasta: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "N�o � poss�vel salvar metainfo de pasta para %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "N�o � poss�vel excluir metainfo de pasta %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Alterando pasta \"%s\" para o formato \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s n�o pode ser reconfigurada pois n�o � uma pasta local"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12793,16 +13025,16 @@ msgstr ""
 "Se voc� n�o pode mais abrir esta caixa postal\n"
 "ent�o voc� precisar repar�-la manualmente."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Voc� n�o pode alterar o formato de pastas remotas."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigurar /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12811,7 +13043,7 @@ msgstr ""
 "Erro enquanto '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12820,7 +13052,7 @@ msgstr ""
 "Erro ao executar opera��o:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Trabalhando"
 
@@ -12828,100 +13060,100 @@ msgstr "Trabalhando"
 msgid "Filtering Folder"
 msgstr "Filtrando pasta"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "No entanto, a mensagem foi enviada com sucesso."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Falha na mensagem %d de %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Conclu�da."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo reposit�rio %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recuperando mensagem %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Recuperando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvando %d mensagem(ns)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12930,7 +13162,7 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12939,11 +13171,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12952,27 +13184,22 @@ msgstr ""
 "N�o � poss�vel criar arquivo de sa�da: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "N�o foi poss�vel escrever dados: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -13027,32 +13254,41 @@ msgstr "Caminho: %s, Tipo: %s"
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Receber e enviar correio"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Cancelar todos"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "O usu�rio cancelou a opera��o."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Lembrar esta senha"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Lembrar esta senha pelo restante desta sess�o"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Entre senha"
 
@@ -13079,7 +13315,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nome:"
 
@@ -13109,7 +13345,7 @@ msgstr "Mensagem encaminhada - %s"
 msgid "Forwarded message"
 msgstr "Mensagem encaminhada"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Mensagem encaminhada"
 
@@ -13123,7 +13359,7 @@ msgstr "Preparando pasta virtual: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13136,94 +13372,97 @@ msgstr ""
 "    '%s'\n"
 "e foi(foram) atualizada(s)."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Sem assunto)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Mensagem"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "N�o vista"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "V�rias mensagens n�o vistas"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "V�rias mensagens"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "M�nima"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "M�xima"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %k:%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -13258,47 +13497,47 @@ msgstr "Recebida"
 msgid "Size"
 msgstr "Tamanho"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Encaminhar"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informa��o da fonte"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Responder a todos"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Visualizar"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13322,16 +13561,16 @@ msgstr "Assinando a pasta \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Cancelando assinatura da pasta \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Pasta"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "N�o foi selecionado um servidor"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Por favor selecione um servidor."
 
@@ -17795,11 +18034,11 @@ msgid "Kushiro Airport"
 msgstr "Aeroporto de Kushiro"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23220,8 +23459,8 @@ msgstr "Sem descri��o"
 msgid "Mail summary"
 msgstr "Resumo das mensagens"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Pastas locais"
 
@@ -23239,15 +23478,15 @@ msgstr "SBFN"
 msgid "Dictionary.com Word of the Day"
 msgstr "\"Word of the Day\" do Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Cita��es do dia"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Adicionar uma fonte de not�cias"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Entre a URL da fonte not�cias que voc� deseja adicionar"
 
@@ -23259,27 +23498,27 @@ msgstr "Erro ao baixar RDF"
 msgid "News Feed"
 msgstr "Fonte de not�cias"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Adicionar"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Sem tarefas"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Sem descri��o)"
 
@@ -24552,7 +24791,8 @@ msgid "Tasks "
 msgstr "Tarefas "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Configura��es de tempo"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24609,7 +24849,7 @@ msgstr "Exibir detalhes"
 msgid "Cancel Operation"
 msgstr "Cancelar opera��o"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24623,20 +24863,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Rascunho"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Caixa de sa�da"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Enviada"
 
@@ -24874,22 +25114,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Criar nova pasta"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"O tipo da pasta selecionada n�o � v�lido para\n"
-"a opera��o desejada."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Criar _nova pasta..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Novo..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Sem nome)"
 
@@ -24911,7 +25144,7 @@ msgstr ""
 "Voc� pode selecionar \"Autom�tico\" se voc� n�o sabe e o Evolution tentar� "
 "descobrir sozinho."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor selecione a informa��o que voc� gostaria de importar:"
 
@@ -24942,21 +25175,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s n�o existe"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Voc� s� pode importar pastas locais"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24965,11 +25194,11 @@ msgstr ""
 "N�o existe importador capaz de tratar\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importando"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24978,17 +25207,17 @@ msgstr ""
 "Importando %s.\n"
 "Iniciando %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Erro ao iniciar %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Erro ao carregar %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24997,31 +25226,31 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Autom�tico"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importar dados e configura��es de programas antigos"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importar um �nico arquivo"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25029,24 +25258,24 @@ msgstr ""
 "Por favor aguarde...\n"
 "Procurando configura��es existentes"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Selecionar uma pasta destino para onde importar estes dados"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importar"
 
@@ -25094,9 +25323,14 @@ msgstr "Abrindo pasta %s"
 msgid "in \"%s\" ..."
 msgstr "Abrir em %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "N�o foi poss�vel renomear pasta: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "N�o � poss�vel criar a pasta especificada:\n"
 "%s"
@@ -25115,8 +25349,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "N�o foi poss�vel iniciar a interface do Assistente de correio do Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Novo"
@@ -25157,58 +25391,59 @@ msgstr "Ir para a pasta..."
 msgid "Select the folder that you want to open"
 msgstr "Selecione a pasta que voc� quer abrir"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Criar um novo atalho"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Selecione a pasta para a qual voc� quer que o atalho aponte:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta exibida)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Nenhum)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "O Ximian Evolution est� atualmente conectado. Clique neste bot�o para "
 "trabalhar desconectado."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "O Ximian Evolution est� em preocesso de se desconectar."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "O Ximian Evolution est� atualmente desconectado. Clique neste bot�o para "
 "trabalhar conectado."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25220,12 +25455,12 @@ msgstr ""
 "O erro do sistema de ativa��o �:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "N�o � poss�vel preparar reposit�rio local -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25236,31 +25471,31 @@ msgstr ""
 "terminou inesperadamente. Voc� ter� que sair do Evolution e reinici�-lo\n"
 "para poder acessar os seus dados novamente."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Argumentos inv�lidos"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "N�o � poss�vel registrar no OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "N�o foi localizado o banco de dados de configura��o"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Erro gen�rico"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25269,107 +25504,117 @@ msgstr ""
 "Voc� deseja realmente excluir o grupo\n"
 "`%s' da barra de atalhos?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "N�o remover"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Renomear grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Renomear grupo de atalhos selecionado para:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "�cones _pequenos"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Exibe os atalhos como �cones pequenos"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "�cones _grandes"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Exibe os atalhos como �cones grandes"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Novo group..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Criar um novo grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Remover este grupo..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Exclui este atalho da barra de atalhos"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Re_nomear este grupo..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Renomear este grupo de atalhos"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Es_conder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Esconder a barra de atalhos"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Criar um novo atalho"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Criar um novo atalho"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Renomear atalho"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Renomear atalho selecionado para:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Abrir a pasta vinculada a este atalho"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Abrir em nova _janela"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Renomear este atalho"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Re_mover"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remove este atalho da barra de atalhos"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Erro ao salvar atalhos."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -25378,56 +25623,56 @@ msgstr "Atalhos"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Sem erro"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "J� existe uma pasta com o mesmo nome"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "O tipo de pasta especificado n�o � v�lido"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "N�o h� espa�o suficiente para criar a pasta"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "A pasta n�o est� vazia"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "A pasta especificada n�o foi achada"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Fun��o n�o implementada neste reposit�rio"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Opera��o n�o suportada"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado n�o � suportado neste reposit�rio"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "A pasta especificada n�o pode ser modificada ou removida"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 "N�o � poss�vel transformar uma pasta em filha de um de seus descendentes"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "N�o � poss�vel criar uma pasta com este nome"
 
@@ -25482,63 +25727,63 @@ msgstr ""
 "O erro do sistema de ativa��o �:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Erro CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Interrompido"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Argumento inv�lido"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "J� possui um dono"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Sem dono"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "N�o encontrado"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Tipo n�o suportado"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Schema n�o suportado"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Opera��o n�o suportada"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existe"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI inv�lida"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Possui sub-pastas"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Sem espa�o remanescente"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "O dono anterior morreu"
 
@@ -25563,6 +25808,26 @@ msgstr "M�quina"
 msgid "The following connections are currently active:"
 msgstr "As seguintes conex�es est�o ativas atualmente:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Agenda"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contatos: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correio"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tarefas"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nome da pasta:"
@@ -25575,6 +25840,34 @@ msgstr "Tipo da pasta:"
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Criar _nova pasta..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome da pasta:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Nome do _servidor:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nome do _usu�rio:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de configura��o do Evolution"
@@ -25672,15 +25965,15 @@ msgstr "N�o pergunte-me novamente"
 msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "O Evolution est� saindo agora ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25700,53 +25993,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "N�o pergunte-me novamente"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "N�o � poss�vel acessar a shell do Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "N�o � poss�vel iniciar a shell do Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Desativar tela de abertura"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Iniciando a importa��o"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a sa�da de depura��o de todos os componentes para um arquivo."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "N�o � poss�vel iniciar o sistema de componentes Bonobo."
 
@@ -25783,116 +26076,110 @@ msgstr "Copiar a sele��o"
 msgid "Copy to Folder..."
 msgstr "_Copiar para pasta..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Criar novo contato"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Criar nova lista de contatos"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Recortar a sele��o"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Excluir contatos selecionados"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Mover as mensagens selecionadas para outra pasta"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Colar a �rea de transfer�ncia"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Visualiza a impress�o dos contatos a serem impressos"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Vi_sualizar impress�o"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Imprimir contatos selecionados"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Salvar contatos selecionados como um VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Selecionar todos"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Selecionar todos os contatos"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Enviar uma mensagem aos contatos selecionados."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Enviar mensagem ao contato"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Enviar contatos selecionados a outra pessoa."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Parar a carga"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "o instante atual"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_A��es"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Lista de _contatos"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Encaminhar contato..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Mover para pasta..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Salvar como VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Buscar contatos"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Selecionar todos"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Enviar _mensagem ao contato..."
@@ -25937,11 +26224,6 @@ msgstr "M�s"
 msgid "Previews the calendar to be printed"
 msgstr "Visualiza a impress�o da agenda a ser impressa"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Vi_sualizar impress�o"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
@@ -25974,7 +26256,7 @@ msgstr "Semana"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Fechar"
 
@@ -25987,7 +26269,7 @@ msgid "Delete this item"
 msgstr "Excluir este item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Barra de tarefas principal"
 
@@ -25999,8 +26281,8 @@ msgstr "Visualiza a impress�o do item impresso"
 msgid "Print this item"
 msgstr "Imprime este item"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Salvar"
 
@@ -26025,9 +26307,9 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -26037,7 +26319,7 @@ msgstr "Imprimir en_velope..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Salvar _como..."
 
@@ -26051,8 +26333,8 @@ msgstr "Enviar _mensagem ao contato..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Salvar"
 
@@ -26152,26 +26434,36 @@ msgstr ""
 "Remover permanentemente todas as mensagens exclu�das de todas as pastas"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Nova mensagem"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Salvando mensagem na pasta"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Exibir janela de visualiza��o de mensagem"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Assinar ou cancelar a assinatura de pastas em servidores remotos"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Editor de pastas _virtuais..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtros..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Painel de visualiza��o"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Assinar pastas..."
 
@@ -26271,7 +26563,7 @@ msgstr "Lista de mensagens encadeadas"
 msgid "_Expunge"
 msgstr "E_xcluir permanentemente"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Pasta"
 
@@ -26532,182 +26824,197 @@ msgstr "Mensagem n�o lida anterior"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Resposta a tarefa"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Verificar novas mensagem em todas as pastas"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Mensagem importante anterior"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Visualiza a impress�o da mensagem a ser impressa"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Imprimir esta mensagem"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Encaminhar a algu�m a mensagem selecionada"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Voltar o texto ao seu tamanho original"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Buscar mensagem..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "M_enor"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Salvar a mensagem como um arquivo texto"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar por texto no corpo da mensagem exibida"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Configurar a p�gina para a sua impressora atual"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Exibir _fonte do e-mail"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Exibir todos os _cabe�alhos"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Exibir a mensagem no estilo normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Exibir a mensagem com todos os cabe�alhos de e-mail"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Exibir o fonte bruto da mensagem"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Tamanho do texto"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Cancelar exclus�o das mensagens selecionadas"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Pasta virtual por _lista de discuss�o..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Pasta virtual por _remetente..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Pasta virtual por _destinat�rios..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Pasta virtual por _assunto..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Copiar para pasta"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Criar filtro a partir da mensagem"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "E_ncaminhar mensagem"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir para"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Embutido"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Maior"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Exibi��o de _mensagem"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Mover para pasta"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Pr�xima mensagem"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Exibi��o _normal"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Abrir mensagem"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Mensagem anterior"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Renomear..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Des_fazer exclus�o"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Fechar"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Ver"
 
@@ -26735,169 +27042,161 @@ msgstr "Cifrar esta mensagem usando o seu certificado de cifragem S/MIME"
 msgid "For_mat"
 msgstr "For_mato"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "_Arquivo texto embutido..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Inserir um arquivo como texto na mensagem"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Inserir arquivo texto..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Abrir"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Abrir um arquivo"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Cifrar com PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Assinar com PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Cifrar com S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Assinar S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salvar como"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Salvar _rascunho"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Salvar na pasta..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Salvar o arquivo atual"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Salvar o arquivo atual com um nome diferente"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Enviar"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Enviar mais _tarde"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Enviar mais _tarde"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Enviar as mensagens em formato HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Enviar a mensagem mais tarde"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Enviar esta mensagem agora"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Exibir / esconder anexos"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Exibir _anexos"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Exibir anexos"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Assinar esta mensagem com a sua chave PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Assinar esta mensagem com o seu certificado de assinatura S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Alternar a exibi��o do campo Bcc"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Alternar a exibi��o do campo Cc"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Alternar a exibi��o do selecionador de Para"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Alternar a exibi��o do campo Responder-a"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Campo _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Campo _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Excluir todos"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Campo _De"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Campo _Responder-a"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Salvar o item e fechar a caixa de di�logo"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "Aj_uda"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Salvar assinatura"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Adicionar pasta em sua lista de pastas assinadas"
@@ -26995,171 +27294,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Adicionar � _barra de atalhos"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Mudar o nome desta pasta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copiar esta pasta"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Criar _nova pasta..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Criar um atalho para esta pasta na barra de atalhos"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Criar uma nova pasta"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Criar um novo atalho"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Criar uma nova pasta"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Excluir esta pasta"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Exibir uma pasta diferente"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Janela do Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importar dados de outros programas"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Mover esta pasta para outro lugar"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Criar _nova pasta..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Abrir em nova janela"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Abrir esta pasta em uma outra janela"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Configura��es do _pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Enviar / receber"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar mensagens na fila de sa�da e recuperar novas mensagens"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configura��o de correio"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Exibir informa��o sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Enviar relat�rio de erro"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Enviar relat�rio de _erro"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relat�rio de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Alternar"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Alternar a exibi��o da barra de pastas"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Alternar a exibi��o da barra de atalhos"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Ver a pasta selecionada"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "_FAQ do Ximian Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Sobre o Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Barra de pastas"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Pasta"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Ir para pasta..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Mover..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nova pasta"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Configura��es do _pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Configura��es do resumo"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Atalho"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Barra de atalhos"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Atalho"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Imprimir resumo"
@@ -27173,17 +27503,40 @@ msgid "Reload the view"
 msgstr "Recarregar a vis�o"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Cart�es de endere�o"
+#, fuzzy
+msgid "By _Company"
+msgstr "Por empresa"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Por empresa"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Cart�es de endere�o"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista de telefones"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vis�o de semana"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Vis�o de dia"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Vis�o de m�s"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vis�o de semana �til"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27209,13 +27562,19 @@ msgstr "Por assunto"
 msgid "Messages"
 msgstr "Mensagens"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Com categoria"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27369,11 +27728,11 @@ msgstr "Codifica��o de caracteres"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor de buscas"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Salvar busca"
 
@@ -27413,21 +27772,21 @@ msgstr "Mensagem"
 msgid "Don't show this message again."
 msgstr "N�o exibir esta mensagem novamente."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Localizar agora"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Limpar"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Localizar agora"
 
@@ -27441,18 +27800,156 @@ msgstr "O servidor pessoal de cat�logo de endere�os"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "O servidor pessoal de agenda; f�brica de agenda"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): n�o foi poss�vel iniciar GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): n�o foi poss�vel iniciar GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
+#~ "Isto pode ter sido causado por uma falha no componente evolution-"
+#~ "addressbook.\n"
+#~ "Para nos ajudar a entender melhor este problema e finalmente resolv�-lo,\n"
+#~ "por favor envie um e-mail para Jon Trowbridge <trow@ximian.com> com uma\n"
+#~ "descri��o detalhada das circunst�ncias sob as quais este erro ocorreu.\n"
+#~ "Obrigado."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "O Evolution n�o p�de obter o reposit�rio local de cat�logo de endere�os.\n"
+#~ "Sob circunst�ncias normais isso nunca deveria acontecer.\n"
+#~ "Voc� pode precisar sair e reiniciar o Evolution para corrigir\n"
+#~ "este problema."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Mover..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "O estado da reuni�o mudou. Enviar uma vers�o atualizada?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Excluir este compromisso"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Erro de E/S"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Erro na resposta de boas-vindas: %s: possivelmente n�o-fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Tempo excedido no pedido HELO: %s: n�o-fatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Erro na resposta de HELO: %s: n�o-fatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Tempo excedido no pedido QUIT: %s: n�o-fatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Inserir arquivo"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Voc� escolheu uma data inv�lida."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "A data da mensagem ser� comparada em rela��o\n"
+#~ "ao instante quando o filtro � executado ou\n"
+#~ "a pasta virtual � aberta."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor de not�cias do Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Voc� tem certeza que deseja excluir esta conta de not�cias?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Voc� deve configurar uma conta antes de poder enviar esta mensagem."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Servidor NNTP:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Fontes de not�cias"
+
+#~ msgid "Source"
+#~ msgstr "Fonte"
+
+#~ msgid "Source Information"
+#~ msgstr "Informa��o da fonte"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Salvar para o disco..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Salvar mensagem como..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Criar nova pasta"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "O tipo da pasta selecionada n�o � v�lido para\n"
+#~ "a opera��o desejada."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Voc� s� pode importar pastas locais"
+
+#~ msgid "_Contact List"
+#~ msgstr "Lista de _contatos"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "_Arquivo texto embutido..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Inserir um arquivo como texto na mensagem"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Inserir arquivo texto..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Enviar mais _tarde"
+
+#~ msgid "Send _later"
+#~ msgstr "Enviar mais _tarde"
+
+#~ msgid "Send the message later"
+#~ msgstr "Enviar a mensagem mais tarde"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Configura��es do _pilot..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Fontes de cat�logos de endere�os"
@@ -27616,10 +28113,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Arquivo de assinatura:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Excluir tudo exceto a assinatura"
 
@@ -28019,9 +28512,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "E_mpresa:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Lembrar esta senha"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Enviar mensagens em formato HTML por padr�o."
 
@@ -28330,12 +28820,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Republic Of Moldova"
 #~ msgstr "Rep�blica de Moldova"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Criar um novo compromisso"
-
-#~ msgid "Create a new task"
-#~ msgstr "Criar uma nova tarefa"
-
 #~ msgid "New _Task"
 #~ msgstr "Nova _tarefa"
 
@@ -28399,9 +28883,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgstr ""
 #~ "Esta op��o conectar� ao servidor POP usando Kerberos 4 para autentica��o."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "N�o foi poss�vel autenticar o servidor KPOP: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Desconhecido)"
 
@@ -28441,9 +28922,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Pasta de armazenagem de correio (interno)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "N�o foi poss�vel conectar ao reposit�rio: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Nova _mensagem de correio"
 
@@ -28525,9 +29003,6 @@ msgstr "init_bonobo(): n�o foi poss�vel iniciar Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Criar ou editar contas de correio e outras prefer�ncias"
 
-#~ msgid "New Message"
-#~ msgstr "Nova mensagem"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_Configura��es de correio..."
 
diff --git a/po/ro.po b/po/ro.po
index 1f1bc0a8b1..a5cf2b5a16 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: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Rom�n� <ro@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "Import fi�ierele card V �n Evolution."
 msgid "File As"
 msgstr "Pune la fi�ier ca"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Nume"
@@ -346,46 +346,46 @@ msgstr "Card V pentru %s"
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot ini�ializa Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Caut..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "�ncarc..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Eroare la c�utarea expresiei."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Adaug� card la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "�terge card de la serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modificare card pentru serverul LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Repornire c�utare."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Primesc rezultatele c�ut�rii LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Eroare �tergere card"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nu pot parsa URL `%s'"
@@ -479,11 +479,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Contacte"
 
@@ -499,23 +499,32 @@ msgstr "Server LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Server LDAP con�in�nd informa�ie de contact"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Contact nou"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Contact"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Creaz� contact nou"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "List� contacte nou�"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Contact"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Contact nou"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Contact"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Creaz� list� nou� de contacte"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -538,30 +547,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, 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:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, 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-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "Semnarea e nesuportat� de acest cifru"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Nu pot ini�ializa gnome-vfs"
 
@@ -569,11 +578,11 @@ msgstr "Nu pot ini�ializa gnome-vfs"
 msgid "Other Contacts"
 msgstr "Alte contacte"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nu pot deschide agenda"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -583,7 +592,7 @@ msgstr ""
 "c� a�i introdus URI incorect, sau serverul LDAP\n"
 "e c�zut"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -595,7 +604,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -603,46 +612,46 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduce�i parola pentru %s"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termin� cu"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Orice c�mp con�ine"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avansat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI pe care navigatorul dosarelor �l va afi�a"
 
@@ -766,7 +775,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Surse agend�"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -860,8 +869,8 @@ msgstr "Configurare mail"
 msgid "Mappings"
 msgstr "Margini"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
@@ -915,8 +924,8 @@ msgstr "Scopul c�ut�rii:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "Caut..."
@@ -1106,15 +1115,15 @@ msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Adaug�"
 
@@ -1160,12 +1169,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Editeaz�"
@@ -1282,10 +1291,10 @@ msgstr "Procesator interfa�a de selectare nume a agendei"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "�terge"
 
@@ -1317,33 +1326,15 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "G�se�te un contact"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr ""
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Selec�ie nume"
@@ -1365,15 +1356,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Mut�..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "_Folder:"
 msgstr "Dosar"
@@ -1487,11 +1473,12 @@ msgstr "Dori�i sa primi�i mail-uri _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_�terge"
 
@@ -2803,7 +2790,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Ascund adresele c�nd trimite�i mail la aceast� list�"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "�te_rge"
 
@@ -2868,7 +2855,7 @@ msgstr ""
 "�n acest dosar. Dori�i s� continua�i �n acest caz?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "C�utare avansat�"
 
@@ -2898,21 +2885,21 @@ msgid "Error getting book view"
 msgstr "Eroare la start %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Eroare la modificare card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Succes"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
@@ -2920,8 +2907,8 @@ msgstr "Eroare necunoscut�"
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Acces interzis"
 
@@ -2938,7 +2925,7 @@ msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2961,48 +2948,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Dosarul `%s' nu exist�."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Alt� eroare"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Dori�i s� salva�i modific�rile?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Eroare ad�ugare list�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Eroare ad�ugare card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Eroare la �tergerea listei"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Eroare �tergere card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Afi�eaz�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Afi�eaz�"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3010,22 +3002,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Nepornit"
@@ -3098,7 +3090,7 @@ msgstr "Agend�"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
@@ -3138,7 +3130,7 @@ msgid "Pilot Settings..."
 msgstr "Set�ri _pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "�nainteaz� _anexat"
@@ -3149,8 +3141,8 @@ msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tip�re�te"
@@ -3170,7 +3162,7 @@ msgid "Move to folder..."
 msgstr "Mut �n folderul..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupeaz�"
 
@@ -3181,20 +3173,20 @@ msgid "Copy"
 msgstr "Copiaz�"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lipe�te"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "�terg"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curent�"
@@ -3367,7 +3359,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Op�iuni"
 
@@ -3459,26 +3451,26 @@ msgstr "_Editeaz� �nt�lnire"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Ridicat"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Sc�zut"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinit"
@@ -3607,11 +3599,11 @@ msgstr "Durata de sfor�ire (minute)"
 msgid "_Edit appointment"
 msgstr "_Editeaz� �nt�lnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Nu e disponibil� o descriere."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3619,13 +3611,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Avertisment"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3636,7 +3628,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Nu m� �ntreba din nou"
@@ -3666,7 +3658,7 @@ msgstr "Descrierea con�ine"
 msgid "Comment contains"
 msgstr "Comentariul con�ine"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr ""
 
@@ -3678,7 +3670,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3702,17 +3694,17 @@ msgstr "%A, %d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Nu pot crea vederea calendar. Verifica�i set�rile pentru ORBit si OAF"
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Confiden�ial"
@@ -3737,7 +3729,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 #, fuzzy
 msgid "Free"
@@ -3745,30 +3737,30 @@ msgstr "Grec"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Ocupat"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nepornit"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "�n derulare"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Terminat"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3779,56 +3771,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Alocat"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nu"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Afi�are zi"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Afi�are s�pt�m�n� de lucru"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Afi�are s�ptam�n�"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Afi�are lun�"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3836,12 +3827,12 @@ msgstr "Calendar"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Sarcini"
 
@@ -3850,44 +3841,62 @@ msgstr "Sarcini"
 msgid "Folder containing to-do items"
 msgstr "Dosar V �n lista de mail"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "�nt�lnire nou�"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "�nt�lnire"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Creaz� o �nt�lnire nou�"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Aceasta e o cerere de �nt�lnire."
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "Sarcin�"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Creaz� o sarcin� nou�"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "�nt�lnire nou�"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "�nt�lnire"
+msgid "Create a new all-day appointment"
+msgstr "Creaz� o �nt�lnire nou�"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3952,7 +3961,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Cu argumentele:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "zile"
 
@@ -3960,11 +3970,13 @@ msgstr "zile"
 msgid "extra times every"
 msgstr "timp �n plus la fiecare"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minute"
 
@@ -4093,7 +4105,7 @@ msgstr "Memorator"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -4122,7 +4134,7 @@ msgstr "sf�r�it �nt�lnire"
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -4312,7 +4324,7 @@ msgid "_Fri"
 msgstr "Vin"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "_General"
 msgstr "General"
@@ -4363,19 +4375,33 @@ msgstr "Mie"
 msgid "before every appointment"
 msgstr "�nainte de sf�r�itul �nt�lnirii"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Datele �nt�lnirii s-au schimbat. Trimit o versiune actualizat�?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� �nt�lnire?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i aceast� sarcin�?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Sunte�i sigur c� dori�i s� anula�i �i �terge�i intrarea din jurnal?"
 
@@ -4445,61 +4471,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nu pot actualiza fi�ierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Editeaz� �nt�lnire"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "�nt�lnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Nu exist� rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nu pot ob�ine versiunea curent�!"
 
@@ -4709,7 +4735,7 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4721,7 +4747,7 @@ msgstr "Rol"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
@@ -4807,7 +4833,7 @@ msgstr "�n"
 msgid "first"
 msgstr "Cea��"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "secund�"
 
@@ -4831,7 +4857,7 @@ msgstr "Cea��"
 msgid "Other Date"
 msgstr "Alt Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "ziua"
 
@@ -4941,20 +4967,27 @@ msgstr "% Terminat"
 msgid "Date Completed:"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#, fuzzy
+msgid "Needs Action"
+msgstr "Selectez o ac�iune"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "�n desf�urare"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritate:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stare"
 
@@ -4969,7 +5002,7 @@ msgstr "De baz�"
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5038,83 +5071,83 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Deschide"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Salveaz� ca..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tip�re�te..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upeaz�"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Copiaz�"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lipe�te"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marcheaz� ca terminat"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marcheaz� sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "�terge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
@@ -5124,8 +5157,8 @@ msgstr "Clic aici s� ad�uga�i o sarcin�"
 msgid "Alarms"
 msgstr "Alarme"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Terminat"
 
@@ -5153,11 +5186,9 @@ msgstr "Prioritate"
 msgid "Start Date"
 msgstr "Data �nceput"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Rezumat"
 
@@ -5199,117 +5230,116 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 #, fuzzy
 msgid "New _Appointment"
 msgstr "�nt�lnire nou�"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Sarcin� nou�"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tip�re�te"
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Configurare mail"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Configurare mail"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Salveaz� ca..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare �nt�lniri"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�nainteaz� ca �i _calendar i"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "F� aceast� apari�ie mutabil�"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "�terge aceast� apari�ie"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "�terge toate apari�iile"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Eroare execu�ie filtru: %s: %s"
@@ -5359,7 +5389,7 @@ msgstr " (Terminat "
 msgid "Task Due: <b>"
 msgstr " (Terminat "
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informa�ie calendar"
@@ -5370,368 +5400,373 @@ msgstr "informa�ie calendar"
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "Eroare necunoscut�"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Ac�iune"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 #, fuzzy
 msgid "Accepted"
 msgstr " Accept� "
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 #, fuzzy
 msgid "Declined"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "a fost dup�"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr " Accept� "
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Inten�ie "
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr " Refuz� "
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renun��"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de �nt�lnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o ac�iune"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "G�se�te �n mesaj"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Ob�ine ultimele informa�ii despre �nt�lnire"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "Informa�ie"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost dup�"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Aceasta e o cerere pentru ultima informa�ie despre sarcin�."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "R�spunde"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Acesta e un r�spuns la o cerere de �nt�lnire."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Aceasta e informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Aceasta e o cerere pentru o informa�ie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Acesta e un r�spuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tip�re�te mesaj"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "S-a produs o eroare la desc�rcarea sursei de �tiri</dt>"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy nu poate fi rulat."
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 #, fuzzy
 msgid "Update complete\n"
 msgstr "�nt�lnire �ncheiat�:"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "Nu pot �nc�rca cursorul\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Alege dosar"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Alege dosar"
@@ -5778,7 +5813,7 @@ msgstr "dat� �nceput"
 msgid "Chair Persons"
 msgstr "Telefon ma�in�"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participant necesar"
@@ -5794,60 +5829,54 @@ msgid "Non-Participants"
 msgstr "Neparticipant"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 #, fuzzy
 msgid "Resource"
 msgstr "Surs�"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr ""
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Scaun"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Participant necesar"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Participant op�ional"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-#, fuzzy
-msgid "Needs Action"
-msgstr "Selectez o ac�iune"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Tentativ�"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "�terse"
@@ -5939,51 +5968,47 @@ msgstr "Ora de �nceput a �nt�lnirii:"
 msgid "Meeting _end time:"
 msgstr "Ora de sf�r�it a �nt�lnirii:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nu pot inc�rca sarcinile �n `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoda necesar� pentru a �nc�rca `%s' nesuportat�"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nu pot deschide dosarul �n `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�terge contactele selectate"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "�nt�lnire nou�..."
 
-#: calendar/gui/e-week-view.c:3489
-#, fuzzy
-msgid "_Delete this Appointment"
-msgstr "�terge aceast� �nt�lnire"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5994,11 +6019,16 @@ msgstr "Nu pot deschide dosarul �n `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoda cerut� pentru deshiderea `%s' nu e suportat�"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "Deschide calendar"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Deschid dosarul %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprilie"
@@ -6056,58 +6086,63 @@ msgstr "Octombrie"
 msgid "September"
 msgstr "Septembrie"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "Informa�ie"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Informa�ie op�ional�"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Informa�ie surs�"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "informa�ie calendar"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "a fost dup�"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Re�mprosp�teaz� lista"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Nu pot ini�ializa Bonobo"
+
+#: calendar/gui/main.c:99
 #, fuzzy
 msgid "Could not create the component editor factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarm�"
@@ -6342,9 +6377,8 @@ msgid "Print Calendar"
 msgstr "Tip�re�te calendar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Previzualizeaz� tip�rirea"
 
@@ -6374,8 +6408,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu m� �ntreba din nou"
@@ -6441,17 +6475,29 @@ msgstr "Import fi�ierele card V �n Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Import fi�ierele card V �n Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Nu m� pot conecta la serverul: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Reaminte�te"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Mesaj calendar"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6460,114 +6506,114 @@ msgstr ""
 "Evolution a g�sit fi�iere de mail Pine.\n"
 "Dori�i s� le importa�i �n Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Deschide calendar"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Eroare de sintax� la parametri sau argumente"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -8192,72 +8238,82 @@ msgstr "Creez dosar nou"
 msgid "You must be working online to complete this operation"
 msgstr "Pentru aceast� opera�ie trebuie s� lucra�i online"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execu�ie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "E�uare la mesajul %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "E�uare la mesajul %d din %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Con�inut invalid al mesajului"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Con�inut invalid al mesajului"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execu�ie filtru c�utare: %s: %s"
@@ -8318,7 +8374,7 @@ msgstr "Copiez mesaje"
 msgid "Copying messages"
 msgstr "Copiez mesajele �n %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8326,47 +8382,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "R�spuns nea�teptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Nici un destinatar specificat"
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8374,18 +8430,18 @@ msgid ""
 "%.*s"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "E�ec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nu pot crea fi�ier temp: %s"
@@ -8411,23 +8467,23 @@ msgid "Could not lock '%s'"
 msgstr "Nu pot bloca: '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nu pot crea fi�ier de blocare pentru %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Timp expirat la �ncercarea de blocare a fi�ierului %s. �ncerca�i mai t�rziu."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "E�uare la blocare prin folosirea fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "E�ec la blocarea prin folosirea flock(2): %s"
@@ -8486,11 +8542,15 @@ msgstr "Eroare la scrierea fi�ierului cu mesaje temporar: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Eroare la copierea fi�ierului cu mesaje temporar: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8625,7 +8685,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "R�spuns de la server de autentificare e�uat�."
 
@@ -8803,33 +8863,134 @@ msgstr "Nu pot crea dosarul blocat la %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "E�ec la verificarea certificatului."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Publicist: %s\n"
-"Subiect: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "E�ec la verificarea certificatului."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Fi�ier semn�tur�:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID certificat:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Eroare la �nc�rcarea %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Afar� din oficiu"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "E�ec la verificarea certificatului."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID certificat:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Con�inut invalid al mesajului"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID certificat:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID certificat:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
-"Certificat invalid de la %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Dori�i s� accepta�i oricum?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8838,16 +8999,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Certificat invalid de la %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Dori�i s� accepta�i oricum?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8867,32 +9045,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Eroare la start %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu exist� mesajul %s �n %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -8900,12 +9083,12 @@ msgstr "Nu pot lua dosarul: %s: %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Opera�ia anulat�"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat nea�teptat"
@@ -8934,42 +9117,42 @@ msgstr "R�spunsul serverului IMAP nu con�ine informa�ia %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "R�spunsul serverului IMAP nea�teptat OK: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nu pot �nc�rca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus �i recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil �n mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 
@@ -8978,10 +9161,10 @@ msgstr "Nu pot g�si corpul mesajului �n r�spunsul FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nu pot deschide directorul cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "E�ec la decodarea mesajului."
@@ -8994,7 +9177,7 @@ msgstr "Verific mailurile noi"
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi �n toate dosarele"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Dosare"
 
@@ -9025,7 +9208,7 @@ msgstr "Pentru citirea �i stocarea mesajelor pe servere IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Parola"
 
@@ -9034,73 +9217,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aceast� op�iune v� va conecta la serverul IMAP folosind o parol� �n clar "
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s serviciu pentru %s �n %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Conexiune anulat�"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nu m� pot conecta la %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Opera�ie nesuportat�"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "E�ec la autentificare."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Dosarul `%s' nu exist�."
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Nu a�i introdus o parol�."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9111,31 +9298,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu exist� dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (...)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nu pot deschide c�su�a po�tal�: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (...)"
@@ -9160,7 +9353,9 @@ msgstr "Dosare speciale"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Pentru stocarea mail-urilor locale �n format standard mbox"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -9191,12 +9386,12 @@ msgstr "Mbox Unix standard"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Pentru stocarea mail-urilor locale �n directoare spool Unix"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -9207,38 +9402,38 @@ msgstr "Stocarea root %s nu e o cale absolut�"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Stoc�rile locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fi�ier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nu pot �terge dosarul index al fi�ierelor `%s': %s"
@@ -9299,7 +9494,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9337,26 +9532,26 @@ msgstr "nu e director maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nu pot scana dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nu pot deschide calea c�tre directorul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Verific mailurile noi"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9402,7 +9597,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9411,7 +9606,7 @@ msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9420,14 +9615,14 @@ msgstr ""
 "Nu pot crea fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, 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:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9436,7 +9631,7 @@ msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a �ters."
@@ -9453,13 +9648,13 @@ msgstr ""
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -9467,52 +9662,52 @@ msgstr ""
 "Nu pot deschide fi�ierul `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nu pot �nchide dosarul temporar: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Eroare necunoscut�: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "E�ec la scrierea �n c�su�a po�tal�: %s: %s"
@@ -9665,51 +9860,51 @@ msgstr "Renun��"
 msgid "Operation failed: %s"
 msgstr "Opera�ia anulat�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Primesc sumarul POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Opera�ia anulat�"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Decupeaz� mesajele selectate"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nici un mesaj cu uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Primesc mesajul POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipita�ie necunoscut�"
@@ -9727,7 +9922,7 @@ msgstr "Las� mesajele pe server"
 msgid "Delete after %s day(s)"
 msgstr "�tergere dup� %s zi(le)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9754,6 +9949,11 @@ msgstr ""
 "prin intermediul protocolului APOP. Aceasta poate s� nu func�ioneze pentru "
 "to�iutilizatorii chiar pe servere care pretind c� suport� acest mod."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nu m� pot conecta la %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9765,54 +9965,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Nu m� pot conecta la serverul POP �n %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Comanda IMAP e�uat�: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Eroare I/O"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Autentificare nereu�it� la serverul KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sV� rog introduce�i parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu exist� dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9839,35 +10041,35 @@ msgstr "Nu pot crea conexiunea c�tre sendmail: %s: mailul nu este trimis"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nu pot trimite mesajul: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail oprit cu mesajul %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nu pot executa %s: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail oprit cu starea %d: mailul nu este trimis."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9978,45 +10180,45 @@ msgstr "E�uare temporar� a autentific�rii"
 msgid "Authentication required"
 msgstr "Necesit� autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "R�spuns de eroare: %s: probabil nu e fatal"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nu m� pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Mesajul nu pare a fi formatat corespunz�tor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Serverul SMTP %s nu suport� tipul cerut de autentificare %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIntroduce�i v� rog parola SMTP pentru %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10027,92 +10229,92 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalid�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "�nt�lnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Comanda HELO a expirat: %s: nefatal"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "R�spuns de eroare la comanda HELO: %s: nefatal"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Timp expirat pentru cererea RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "E�ec la cererea AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "R�spuns de la server: autentificare e�uat�.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "R�spuns de eroare la comanda MAIL FROM: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Comanda RCPT TO a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
@@ -10120,90 +10322,90 @@ msgstr "Comanda DATA a expirat: %s: mailul nu a fost trimis"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA - timp expirat: terminarea mesajului: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "R�spuns de la server de autentificare e�uat�."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Timp expirat pentru cererea RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Comanda QUIT a expirat: %s: nefatal"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Comanda AUTH a expirat: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "R�spuns de eroare RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u octe�i"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "anex�"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Adaug� anex�..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Anexeaz� un fi�ier la mesaj"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Acesta nu este un fi�ier normal."
@@ -10221,56 +10423,60 @@ msgid "MIME type:"
 msgstr "Tip MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afi�area automat� a anexei"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Clic aici pentru agend�"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "De la:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "R�spunde la:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "De la:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Subiect:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "La:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Introduce�i destinatarul mesajului"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduce�i adresele care vor primi o copie a mesajului"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10278,17 +10484,25 @@ msgstr ""
 "Introduce�i adresele care vor primi o copie a mesajului f�r� s� apar� �n "
 "lista destinatarilor mesajului"
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Port:"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Anexeaz� un fisier"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nu pot crea un context pentru o semn�tur� PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10297,34 +10511,34 @@ msgstr ""
 "Eroare la citirea fi�ierului: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Avertisment!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Fi�ierul exist�, suprascriu?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Eroare la salvarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Eroare la �nc�rcarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Eroare la accesarea fi�ierului: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10333,7 +10547,7 @@ msgstr ""
 "Nu pot c�uta �n fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10342,7 +10556,7 @@ msgstr ""
 "Nu pot trunchia fi�ierul: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10351,7 +10565,7 @@ msgstr ""
 "Eroare la salvarea automat� a mesajului: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -10360,7 +10574,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10369,50 +10583,46 @@ msgstr ""
 "Acest mesaj nu a fost trimis.\n"
 "Dori�i s� salva�i modific�rile?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje �naintate"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Deschide fi�ier"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Insereaz� fi�ier"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Salveaz� semn�tura"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (implicit)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Compune un mesaj"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10421,9 +10631,9 @@ 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:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10496,8 +10706,8 @@ msgstr "Numele con�ine"
 msgid "Subject does not contain"
 msgstr "nu con�ine"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10505,12 +10715,11 @@ msgstr ""
 "Fi�ier al c�rui nume exist� deja.\n"
 "�l suprascrie�i?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Memorez aceast� parol�"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10618,152 +10827,102 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I:%M %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "an"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "ani"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "secunde"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "lun�"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "luni"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "or�"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "s�pt�m�n�"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "s�pt�m�ni"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "or�"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "lun�"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "luni"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "secunde"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "an"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "ani"
+
+#: filter/filter-datespec.c:174
 #, fuzzy
 msgid "You have forgotten to choose a date."
 msgstr "Oops. A�i uitat s� alege�i o dat�."
 
-#: filter/filter-datespec.c:196
-#, fuzzy
-msgid "You have chosen an invalid date."
-msgstr "Oops. A�i ales o dat� invalid�."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<clic aici pentru a selecta o dat�>"
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Data mesajului va fi comparat� indiferent dac�\n"
-"filtrul ruleaz� sau dosarul v este deschis."
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "acum"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Data mesajului va fi comparat� indiferent\n"
-"de ora specificat� aici."
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %Y"
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
-"Data mesajului va fi comparat� chiar dac� un\n"
-"filtru relativ de timp ruleaz�;\n"
-"\"s�pt�m�na trecut�\", de exemplu."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "ora curent�"
 
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "ora specificat�"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "o or� relativ� la ora curent�"
-
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Selectez ora local�"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Compar� fa�� de"
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "acum"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<clic aici pentru a selecta o dat�>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Reguli filtre"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Nume stil:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fi�ierul spool `%s' nu exist� sau nu e un fi�ier obi�nuit."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Selectez o ac�iune"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Atunci"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Adaug� ac�iune"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -10772,12 +10931,12 @@ msgstr ""
 "Oops, a�i uitat s� alege�i un dosar.\n"
 "V� rog merge�i �napoi �i preciza�i un dosar pentru livrarea mailului."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10786,93 +10945,168 @@ msgstr ""
 "Eroare �n expresia regulat� '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Important"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Lucrez"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "La"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "dup�"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Schimb� numele acestui dosar"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Nume regul�:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "F�r� titlu"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Dac�"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Execut� ac�iunile"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "dac� toate criteriile sunt �ndeplinite"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "dac� oricare criteriu e �ndeplinit"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Adaug� criteriu"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "intr�"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "iese"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Compar� fa�� de"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Editeaz� filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Editeaz� dosare V"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Intr�"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Iese"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Data mesajului va fi comparat� indiferent\n"
+"de ora specificat� aici."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Data mesajului va fi comparat� chiar dac� un\n"
+"filtru relativ de timp ruleaz�;\n"
+"\"s�pt�m�na trecut�\", de exemplu."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Data mesajului va fi comparat� indiferent\n"
+"de ora specificat� aici."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Dosare virtuale"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "o or� relativ� la ora curent�"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "numai dosare specifice"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "ora curent�"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "ora specificat�"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Surse dosare V"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "cu toate dosarele distante active"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "cu toate dosarele locale �i distante active"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "cu toate dosarele locale"
 
@@ -10900,42 +11134,42 @@ msgid "Beep"
 msgstr "M�rime"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Companie"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "con�ine"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copiaz� �n dosar"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Date recep�ionate"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Date trimise"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�terse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "nu con�ine"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nu se termin� cu"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "nu exist�"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "nu exist�"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nu sun� ca"
@@ -10957,93 +11191,89 @@ msgid "ends with"
 msgstr "se termin� cu"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Exist�"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "exist�"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Expresie"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Important"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "este"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "a fost dup�"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "a fost �nainte"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "e mai mare dec�t"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "e mai mic dec�t"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nu este"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Marcat"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "eticheta26"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Lista de mail"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Corp mesaj"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Antet mesaj"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Mut� in dosar"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Trimite mesaj la contact"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Red� sunetul:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Cite�te"
 
@@ -11059,57 +11289,87 @@ msgstr "Potrivire regex"
 msgid "Replied to"
 msgstr "R�spuns la"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "e mai mare dec�t"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "e mai mic dec�t"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Punctaj"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Expeditor"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Seteaz� starea"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Companie"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "M�rime (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "sun� ca"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Cont surs�"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Antet specific"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "�ncepe cu"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Subiect"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Seteaz� starea"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Reguli"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Adaug� reguli"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Editez reguli"
 
@@ -11117,12 +11377,12 @@ msgstr "Editez reguli"
 msgid "Score Rules"
 msgstr "Reguli de punctaj"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "Schimb� numele acestui dosar"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -11131,19 +11391,19 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "Component� Evolution pentru manipularea mailului."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 #, fuzzy
 msgid "Importing..."
 msgstr "Se import�"
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 #, fuzzy
 msgid "Please wait"
 msgstr "se termin� cu"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -11151,15 +11411,15 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%s\""
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Mail"
 
@@ -11220,41 +11480,41 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Gunoi"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Fi�ier mail-uri locale %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 #, fuzzy
 msgid "Scanning directory"
 msgstr "Scanez dosarul IMAP"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 #, fuzzy
 msgid "Starting import"
 msgstr "_Data �nceput:"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Set�ri"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editeaz� filtre"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11337,12 +11597,12 @@ msgstr "Procesator pentru componenta sumar mail."
 msgid "Font Preferences"
 msgstr "Modific� preferin�e"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Conturi"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferin�e calendar"
@@ -11396,67 +11656,87 @@ msgstr "_Propriet��i..."
 msgid "Change this folder's properties"
 msgstr "Modific� propriet��ile fi�ierului"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Nu a�i setat o metod� de transport a mailului"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Mesaje �naintate"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Compune un mesaj"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Mesaj"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Tip�re�te mesaj"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Mesaj _mail"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Conectare la server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Propriet��i pentru \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Propriet��i"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nu pot crea directorul temporar: %s"
@@ -11506,135 +11786,135 @@ msgstr "%d total"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Creaz� dosar virtual din mesaj"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Editeaz� ca mesaj nou..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Ti_p�re�te"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_R�spunde la expeditor"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "R�spunde la _list�"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "R�spunde la to�i"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_�nainteaz�"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�terge"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Marcheaz� ca citit"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcheaz� ca important"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_upereaz�"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut �n folderul..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Copiaz� �n dosarul..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaug� expeditorul �n agend�"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplic� filtre"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Creaz� regul� din mesaj"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Dosar V �n lista de mail"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtru pe lista de mail (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Dosar V pe lista de mail (%s)"
@@ -11700,79 +11980,70 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor de �tiri Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazd�:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Nu �terge"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Chiar �terge�i acest cont?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Invalideaz�"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Enabled"
 msgstr "Valideaz�"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Management cont"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr ""
 
@@ -11781,30 +12052,30 @@ msgstr ""
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Adaug� regul� de filtrare"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11812,7 +12083,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11824,7 +12095,7 @@ msgstr ""
 "trimite, primi sau compune mailuri.\n"
 "Dori�i s� face�i configurarea acum?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11832,7 +12103,7 @@ msgstr ""
 "Trebuie s� configura�i o identitate\n"
 "�nainte de a putea compune mailuri."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11841,18 +12112,18 @@ msgstr ""
 "�nainte pentru a putea compune mailuri. "
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Trimite un email"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11860,18 +12131,18 @@ msgstr ""
 "Acest mesaj nu are subiect.\n"
 "Chiar trimite�i?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Mesajul con�ine numai cererile nesuportate."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 #, fuzzy
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
@@ -11883,16 +12154,11 @@ msgstr ""
 "ad�ugarea unui antet Aparent-la.\n"
 "Trimite�i oricum?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Trebuie s� specifica�i un destinatar pentru a trimite acest mesaj."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Trebuie s� configura�i un cont �nainte pentru a putea s� trimite�i acest mail"
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11900,29 +12166,29 @@ msgstr ""
 "Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
 "Dori�i s� folosi�i dosarul cu ciorne implicit?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscut�"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Mut� mesaj(e) �n"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Copiaz� mesaje(le) �n"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� edita�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11930,7 +12196,7 @@ msgstr ""
 "Pute�i numai s� edita�i mesajele\n"
 "salvate �n dosarul Ciorne"
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11938,39 +12204,39 @@ msgstr ""
 "Pute�i numai s� retrimite�i mesajele\n"
 "din dosarul Trimise"
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Sunte�i sigur c� dori�i s� retrimite�i toate cele %d mesaje?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Nici un mesaj selectat"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Suprascrie�i fi�ierul?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Salveaz� mesajul ca..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Salveaz� mesajele ca..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Afi�eaz� urm�torul mesaj necitit"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11978,7 +12244,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11987,28 +12253,28 @@ msgstr ""
 "Eroare la �ncarcarea informa�iei de filtrare:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Tip�re�te mesaj"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Tip�rirea mesajului nereu�it�"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -12031,7 +12297,7 @@ msgstr "Descriere:"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contact schimbat:"
@@ -12055,8 +12321,8 @@ msgstr "Salveaz� semn�tura"
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "V� rog introduce�i numele �i adresa de email mai jos. C�mpurile \"op�ional"
 "\"de mai jos nu e necesar s� le completa�i dec�t dac� dori�i s� include�i "
@@ -12066,8 +12332,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "V� rog introduce�i mai jos informa�ii despre serverul de mail de intrare. "
 "Dac� nu �ti�i ce fel de server folosi�i, contacta�i administratorul "
@@ -12081,8 +12346,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "V� rog introduce�i mai jos informa�ii despre protocolul de mail de ie�ire. "
 "Dac� nu �ti�i ce protocol folosi�i, contacta�i administratorul dumneavostr� "
@@ -12092,12 +12356,10 @@ msgstr ""
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Aproape a�i terminat procesul de configurare a mailului. Identitatea,"
 "serverul de mail de intrare �i metoda de transport a a mailului ce le-a�i "
@@ -12106,44 +12368,21 @@ msgstr ""
 "doar pentru afi�are."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Lucrez"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "La"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "dup�"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Cont"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
@@ -12412,244 +12651,232 @@ msgstr "Salveaz� �i �nchide"
 msgid "Loading Images"
 msgstr "�ncarc� _imaginile"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Loca�ie c�su�� po�tal�"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Cea��"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Server NNTP"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Dosar _nou"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Informa�ie op�ional�"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_za�ie:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tip�re�te contactele selectate"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "Memorez aceast� parol�"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "R�spunde la:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Op�iuni primire"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Memorez aceast� parol�"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Informa�ie cerut�"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Implicit"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Securitate"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME securizat"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Selecteaz� binarul PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Trimite �i mesajele ciorn�"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesit� _autentificare"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Configurare server"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Scurt�turi"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Salveaz� semn�tura"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Surs�"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informa�ie surs�"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -12660,214 +12887,210 @@ msgstr ""
 "\n"
 "Clic \"Urm�torul\" pentru a �ncepe"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Est"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Always load images off the net"
 msgstr "�ntotdeauna �ncarc� imaginile neconectat"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Tip de autentificare: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Verific� automat dac� sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Valideaz�"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "�nainteaz� ca"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Nume complet:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "�n mailuri HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitate"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "�ncarc� imaginile dac� expeditorul e �n agend�"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "F� contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marcheaz� mesajele ca \"Citit\" dup�"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Never load images off the net"
 msgstr "Nu �nc�rca niciodat� imaginile neconectat"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "Cale binar� PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "�ntreab�-m� c�nd trimit mesaje f�r� subiect"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "R�spunde la to�i"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie toren�ial�"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Semn�tur� HTML:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Folose�te conectare securizat� (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "Fiecare"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "fereastra-�tiri1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12891,207 +13114,217 @@ msgstr "Nu pot crea un context pentru anvelopa S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nu pot crea temporar mbox `%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Salveaz� pe disc..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Salveaz� anexa"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Vedere inline"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide �n %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vedere inline (via %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Ascund"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Vizualizator extern"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "�ncarc� _imaginile"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�ncarc con�inut mesaj"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Termen dep�it"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Deschide leg�tura �n navigator"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Copiaz� leg�tura c�tre loca�ia"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Salveaz� leg�tura ca (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salveaz� imaginea ca..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s anex�"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nu pot parsa mesajul MIME. Afi�ez ca surs�."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 #, fuzzy
 msgid "Bad Address"
 msgstr "Adresa email:"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "De la"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "R�spuns-la:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "La"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Program de mail:"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Salveaz� mesajul ca..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nu pot crea un context pentru o verificare PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Acest mesaj este semnat digital �i este autentic."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Acest mesaj este semnat digital dar nu se poate dovedi c� e autentic."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator c�tre fi�ierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator c�tre fi�ierul local (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator c�tre site-ul FTP (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator c�tre o dat� extern� necunoscut� (tip \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului par�ial deformat."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Dosare speciale"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Reconfigurez dosarul"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Nu pot salva informa�ia meta a dosarului; probabil c� nu ve�i mai putea\n"
 "deschide acest dosar: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Nu pot �terge dosarul `%s':\n"
 "%s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Schimb dosarul \"%s\" �n formatul \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13099,17 +13332,17 @@ msgstr ""
 "Dac� nu o s� pute�i deschide aceast� c�su�� po�tal�, atunci\n"
 "probabil va trebui s� o repara�i manual."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nu pute�i copia mesaje din acest dosar"
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Reconfigureaz� %s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13118,7 +13351,7 @@ msgstr ""
 "Eroare �n timpul '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13127,7 +13360,7 @@ msgstr ""
 "Eroare �n timpul opera�iei:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Lucrez"
 
@@ -13136,101 +13369,101 @@ msgstr "Lucrez"
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Trimit \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "E�ec la mesajul %d din %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Salvez mesaj �n dosar"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele �n %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele �n %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "�terg dosarul %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Primesc mesaje"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Salvez mesajele"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13239,7 +13472,7 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13248,11 +13481,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13261,27 +13494,22 @@ msgstr ""
 "Nu pot crea fi�ierul de ie�ire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Caut�"
 
@@ -13338,34 +13566,43 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Trimite & Prime�te mailul"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "Renun��"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Actualizez..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "A�tept..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Opera�ie anulat� de utilizator."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Memorez aceast� parol�"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduce�i parola pentru %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduce�i parola pentru %s"
@@ -13394,7 +13631,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Nume:"
 
@@ -13425,7 +13662,7 @@ msgstr "Mesaj �naintat - %s"
 msgid "Forwarded message"
 msgstr "Mesaje �naintate"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Mesaje �naintate"
@@ -13440,7 +13677,7 @@ msgstr "Creez dosar nou"
 msgid "Updating vfolders for uri: %s"
 msgstr "Scanez dosarele �n \"%s\""
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13449,97 +13686,100 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Dosare V"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editeaz� dosare V"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 #, fuzzy
 msgid "(No subject)"
 msgstr "�naintat: (f�r� subiect)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, fuzzy, c-format
 msgid "%s - Message"
 msgstr "Mesaj"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Nev�zut"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "V�zut"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "R�spuns"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nev�zute multiple"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Cea mai sc�zut�"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Mai sc�zut�"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Ast�zi %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -13574,47 +13814,47 @@ msgstr "Primit"
 msgid "Size"
 msgstr "M�rime"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Rechemare"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Mergi �nainte �n timp"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informa�ie surs�"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "�nainteaz�"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "R�spunde"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "R�spunde la to�i"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Previzualizare"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13638,17 +13878,17 @@ msgstr "Abonare la dosarul \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Dezabonare de la dosarul \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dosar"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost �ters."
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr ""
 
@@ -18494,11 +18734,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -24421,8 +24661,8 @@ msgstr "Descriere:"
 msgid "Mail summary"
 msgstr "Sumar mail"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
@@ -24441,15 +24681,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Vorba zilei"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Cotele zilei"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Adaug� o surs� de �tiri"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Introduce�i URL-ul sursei de �tiri pe care o ad�uga�i"
 
@@ -24463,26 +24703,26 @@ msgstr "<b>Eroare �n timpul desc�rc�rii RDF</b>"
 msgid "News Feed"
 msgstr "Dosar _nou"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Tot"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "Adaug�"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Ploaie toren�ial�"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Nu exist� sarcini"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "Descriere:"
@@ -25791,7 +26031,8 @@ msgid "Tasks "
 msgstr "Sarcini"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Set�ri vreme"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -25854,7 +26095,7 @@ msgstr "Arat� detalii"
 msgid "Cancel Operation"
 msgstr "Anulare opera�ie"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -25868,22 +26109,22 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Alege dosar"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 #, fuzzy
 msgid "Drafts"
 msgstr "Ciorn�"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 #, fuzzy
 msgid "Sent"
 msgstr "V�zut"
@@ -26112,22 +26353,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Creare dosar nou"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Tipul fi�ierului selectat nu e valid pentru\n"
-"opera�ia cerut�."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Crez� dosar nou..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nou..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(F�r� titlu)"
 
@@ -26149,7 +26383,7 @@ msgstr ""
 "Pute�i selecta \"Automat\" dac� nu �ti�i tipul �i Evolution va �ncerca s�-l "
 "determine automat."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -26180,22 +26414,18 @@ msgstr ""
 msgid "Select importer"
 msgstr "Alege dosar"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu exist�."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -26204,11 +26434,11 @@ msgstr ""
 "Nu se reu�e�te importul\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Se import�"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -26217,17 +26447,17 @@ msgstr ""
 "Se import� %s.\n"
 "Start %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Eroare la start %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Eroare la �nc�rcarea %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -26236,55 +26466,55 @@ msgstr ""
 "Se import� %s\n"
 "Se import� elementul 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Nume fi�ier:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Selecteaz� un fi�ier"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Tip fi�ier:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "Import fi�iere"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Alege�i dosarul destina�ie pentru importul datelor"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -26330,9 +26560,14 @@ msgstr "Deschid dosarul %s"
 msgid "in \"%s\" ..."
 msgstr "Deschide �n %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nu pot redenumi dosarul: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Nu pot crea dosarulul precizat:\n"
 "%s"
@@ -26349,8 +26584,8 @@ msgstr "Nu pot ini�ializa componenta mail Evolution."
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nu pot ini�ializa componenta mail Evolution."
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nou"
@@ -26394,42 +26629,43 @@ msgstr "Mergi la dosarul..."
 msgid "Select the folder that you want to open"
 msgstr "Alege�i dosarul pe care dori�i s�-l deschide�i"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Creaz� o scurt�tur� nou�"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Alege�i dosarul spre care dori�i s� indice scurt�tura:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucreaz� offline"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Lucreaz� deconectat"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nici un dosar afi�at)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, fuzzy, c-format
 msgid "%s (%d)"
 msgstr "%s (...)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 #, fuzzy
 msgid "(None)"
 msgstr "(F�r� nume)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
@@ -26437,12 +26673,12 @@ msgstr ""
 "Evolution este actualmente conectat. Da�i clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 #, fuzzy
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Evolution este �n proces de deconectare."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 #, fuzzy
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
@@ -26450,7 +26686,7 @@ msgstr ""
 "Evolution este actualmente deconectat. Da�i clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -26458,12 +26694,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nu pot seta stocarea local� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -26471,32 +26707,32 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Eroare generic�"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi."
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Nume grup:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -26505,109 +26741,119 @@ msgstr ""
 "Chiar dori�i s� �nl�tura�i grupul\n"
 "`%s' din bara de scurt�turi?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Nu �nl�tura"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Redenume�te grupul de scurt�turi"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Redenume�te grupul de scurt�turi selectat �n:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Iconuri mici"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Arat� scurt�turile ca iconuri mici"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Iconuri mari"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Arat� scurt�turile ca iconuri mari"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "Grup _Nou..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Creaz� un grup nou de scurt�turi"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "�nl�tur� acest g_rup..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "�nl�tur� acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Rede_nume�te acest grup..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Redenume�te acest grup de scurt�turi"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ascunde bara de scurt�turi"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Creaz� o scurt�tur� nou�"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Creaz� o scurt�tur� nou�"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Redenume�te scurt�tura"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Redenume�te scurt�tura selectat� �n:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Deschide dosarul legat la aceast� scurt�tur�."
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Deschide �n fereastr� noua"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenume�te"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Redenume�te aceast� scurt�tur�"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 #, fuzzy
 msgid "Re_move"
 msgstr "�terge"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�nl�tur� aceast� scurt�tur� din bara de scurt�turi"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Eroare la salvarea scurt�turilor."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Scurt�turi"
 
@@ -26615,57 +26861,57 @@ msgstr "Scurt�turi"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "F�r� eroare"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Exist� deja un dosar cu acela�i nume"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Tipul de dosar specificat nu e valid"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Eroare I/O"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Spa�iu insuficient pentru a crea dosarul"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Func�ie neimplementat� �n aceast� stocare"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Opera�ie nesuportat�"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Tipul specificat nu e suportat �n acest� stocare"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Dosarul specificat nu a fost g�sit"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 #, fuzzy
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nu pot muta un dosar �ntr-unul din descenden�ii s�i/"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
@@ -26710,74 +26956,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "Eroare I/O"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "Con�inut invalid al mesajului"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "Nimeni"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "Nu g�sesc fi�ierul"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr "Verific tipurile suportate"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "Opera�ie anulat� de utilizator."
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "Alt� eroare"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "Exist�"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Invalid"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "Nu exist� dosarul %s"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "Nici un mesaj selectat"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -26802,6 +27048,26 @@ msgstr "Gazd�"
 msgid "The following connections are currently active:"
 msgstr "Urmatoarele conexiuni sunt actualmente active:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Calendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacte"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Mail"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Sarcini"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Nume dosar:"
@@ -26814,6 +27080,34 @@ msgstr "Tip dosar:"
 msgid "Specify where to create the folder:"
 msgstr "Preciza�i unde s� fie creat dosarul:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crez� dosar nou..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nume dosar:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Mesaj server:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Nume utilizator:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -26912,16 +27206,16 @@ msgstr "Nu m� �ntreba din nou"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution a g�sit urm�toarea surs� de date:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Set�ri Evolution..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -26953,7 +27247,7 @@ msgstr ""
 "Sper�m s� v� bucura�i de rezultatele eforturilor noastre, �i a�tept�m\n"
 "cu ner�bdare contribu�ia dumneavostr�!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -26962,48 +27256,48 @@ msgstr ""
 "V� mul�umim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nu m� �ntreba din nou"
 
-#: shell/main.c:347
+#: shell/main.c:348
 #, fuzzy
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, fuzzy, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nu pot accesa shell-ul Evolution."
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Invalideaz� ecranul de pornire"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data �nceput:"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data �nceput:"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ie�irile pentru depanare ale tuturor componentelor �ntr-un fi�ier."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nu pot ini�ializa sistemul de componente Bonobo."
 
@@ -27043,122 +27337,115 @@ msgstr "Copiaz� selec�ia"
 msgid "Copy to Folder..."
 msgstr "Copiez �n folderul..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Creaz� contact nou"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Creaz� list� nou� de contacte"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Decupeaz� selec�ia"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Trimite co_ntact la altcineva..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Mut �n folderul..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Lipe�te clipboard-ul"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Previzualizeaz� contactele ce vor fi tip�rite"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Pre_vizualizeaz� tip�rire"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tip�re�te contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Save selected contacts as a VCard."
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Selecteaz� tot"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Selecteaz� toate contactele"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "�terge contactele selectate"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Trimite mesaj la contact"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 #, fuzzy
 msgid "Send selected contacts to another person."
 msgstr "Trimite contact la altcineva"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Opre�te �nc�rcarea"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "ora curent�"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Ac�iuni"
 
-#: ui/evolution-addressbook.xml.h:33
-#, fuzzy
-msgid "_Contact List"
-msgstr "_Contact"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 #, fuzzy
 msgid "_Forward Contact..."
 msgstr "_Contacte..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Mut� �n dosar..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "_Save as VCard"
 msgstr "Salveaz� ca �i card V"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "_Search for Contacts"
 msgstr "_Caut� contacte"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Selecteaz� tot"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Trimite _mesaj c�tre contact..."
@@ -27207,11 +27494,6 @@ msgstr "Luna"
 msgid "Previews the calendar to be printed"
 msgstr "Previzualizeaz� calendar ce va fi tip�rit"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Pre_vizualizeaz� tip�rire"
-
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Print this calendar"
@@ -27248,7 +27530,7 @@ msgstr "S�pt�m�n�"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "�nchide"
 
@@ -27262,7 +27544,7 @@ msgid "Delete this item"
 msgstr "�terge acest articol"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Bara de unelte principal�"
 
@@ -27274,8 +27556,8 @@ msgstr "Previzualizeaz� articolul tip�rit"
 msgid "Print this item"
 msgstr "Tip�re�te acest articol"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Salveaz�"
 
@@ -27301,9 +27583,9 @@ msgstr "Salveaz� acest articol pe disc"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Fi�ier"
 
@@ -27313,7 +27595,7 @@ msgstr "Tip�re�te plic..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "S_alvez� ca..."
 
@@ -27328,8 +27610,8 @@ msgstr "Trimite _mesaj c�tre contact..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Salveaz�"
 
@@ -27426,26 +27708,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "�terg pentru totdeauna mesajele �terse din toate dosarele"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Compune mesaj _nou"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Salvez mesaj �n dosar"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Arat� fereastra de previzualizare mesaje"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "V� abona�i sau dezabona�i la dosarele de pe serverul distant"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor dosar virtual..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Subscribe to Folders..."
 msgstr "Abonare la dosarul \"%s\""
@@ -27547,7 +27839,7 @@ msgstr "List� de mesaje �nl�n�uite"
 msgid "_Expunge"
 msgstr "Distrug_e"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "Dosar"
 
@@ -27810,185 +28102,200 @@ msgstr "Afi�eaz� mesajul necitit precedent"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "R�spunde"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Verific mesajele noi �n toate dosarele"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Afi�eaz� mesajul precedent important"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Preview the message to be printed"
 msgstr "Previzualizeaz� mesajul ce va fi tip�rit"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Precedent"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Print this message"
 msgstr "Tip�re�te mesaj"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "�nainteaza mesajul selectat c�tre cineva"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 #, fuzzy
 msgid "S_earch Message..."
 msgstr "Caut� m_esajul"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Salveaz� mesajul ca un fi�ier text"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Caut� textul �n corpul mesajului afi�at"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Set�ri de pagin� pentru imprimanta curent�"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Arat� sursa mesajului"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Arat� toate antetele"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Arat� mesajul �ntr-un stil normal"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Arat� mesajul cu toate antetele mesajului"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Ata�eaz� sursa primar� a mesajului a mesajului"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Recupereaz� mesajele selectate"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Dosar V pentru _lista de mail..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Dosar V pentru expeditor..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Dosar V pentru destinata_ri..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Dosar V pentru _subiect..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Ata�eaz�"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Copiaz� �n folder"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Creaz� filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "�nainteaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "�n linie"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "Pager"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Afi�eaz� mesaj"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Mut� in dosar"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Mesaj"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Afi�are normal�"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Tip�re�te mesaj"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cotat"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Redenume�te..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Unelte"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Rec_upereaz�"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "�nchide aceast� fereastr�"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "�n_chide"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Vizualizare"
 
@@ -28017,172 +28324,163 @@ msgstr "Cripteaz� acest mesaj cu certificatul de criptare S/MIME"
 msgid "For_mat"
 msgstr "Format"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-#, fuzzy
-msgid "Inline Text _File..."
-msgstr "Insereaz� fi�ier text..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Insereaz� un fi�ier ca text �n mesaj"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Insereaz� fi�ier text..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Deschide"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Deschide fi�ier"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Criptare PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Semn�tur� PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Criptare S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Semneaz� S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salveaz� ca"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Salveaz� ciorna"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Salveaz� �n dosar..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Salveaz� fi�ierul curent"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Salveaz� fi�ierul curent cu un nume diferit"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Salvez mesajul �ntr-un dosar specificat"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Trimite"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Trimite mai t�rziu"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Trimite mai t�rziu"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Trimite mailul �n format HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Trimite mesajul mai t�rziu"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Trimite acest mesaj acum"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Arat� / ascunde anexele"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Arat� _anexele"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Arat� anexele"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Semna�i acest mesaj cu cheia dumneavoastr� PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Semna�i acest mesaj cu semn�tura certificat� S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul BCC e afi�at "
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul CC e afi�at"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Selecteaz� �n timp ce c�su�a De la e afi�at�"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Selecteaz� �n timp ce c�mpul R�spuns la e afi�at"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "_Attachment..."
 msgstr "_Anexa"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "C�mpul _Bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "C�mpul _Cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "�terge tot"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "C�mpul De la"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Insereaz�"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "Deschide..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "C�mpul _R�spuns la"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Salveaz� lista �i �nchide c�su�a de dialog"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "Ajutor"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Salveaz� semn�tura"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Adaug� dosarul la lista dosarelor �nscrise"
@@ -28284,172 +28582,203 @@ msgid "Add to _Shortcut Bar"
 msgstr "Adaug� la bara cu _scurt�turi"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Set�ri Evolution..."
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Schimb� numele acestui dosar"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Copiaz� acest dosar"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Crez� dosar nou..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Creaz� o leg�tur� la acest dosar �n bara de scurt�turi"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Creez un dosar nou"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Creaz� o scurt�tur� nou�"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Creez un dosar nou"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "�terge acest dosar"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Afi�eaz� un dosar diferit"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Ie�ire"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Fereastra Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Ie�ire din program"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Mut� acest dosar �n alt� parte"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Crez� dosar nou..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Deschide �n fereastr� nou�"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Deschide acest dosar �n alt� fereastr�"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Set�ri _pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Trimite mailurile din coad� �i descarc� mailurile noi"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Configurare mail"
+
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "Show information about Ximian Evolution"
 msgstr "Arat� informa�ii despre Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Raporteaz� o eroare"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raporteaz� o problem� folosind Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Comut�"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Comut� �n timp ce se arat� bara folder"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Comut� �n timp ce se arat� bara cu scurt�turi"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Selecteaz� �n timp lucr�m deconecta�i"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Vizualizeaz� dosarul selectat"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Despre Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Copiaz�..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Bara dosar"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "Dosar"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Mut�..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Dosar _nou"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Set�ri _pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Preferin�e sarcini..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Redenume�te..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "Trimite / Prime�te"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Scurt�tur�"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Bara cu _scurt�turi"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Scurt�tur�"
+
 #: ui/my-evolution.xml.h:3
 #, fuzzy
 msgid "Print summary"
@@ -28464,17 +28793,40 @@ msgid "Reload the view"
 msgstr ""
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "C�r�i de vizit�"
+#, fuzzy
+msgid "By _Company"
+msgstr "Dup� companie"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Dup� companie"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "C�r�i de vizit�"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Lista de telefoane"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Afi�are s�ptam�n�"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Afi�are zi"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Afi�are lun�"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Afi�are s�pt�m�n� de lucru"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -28500,13 +28852,19 @@ msgstr "Dup� subiect"
 msgid "Messages"
 msgstr "Mesaje"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Cu categorie"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "Sarcin�"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -28661,12 +29019,12 @@ msgstr "Codare caractere"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 #, fuzzy
 msgid "Search Editor"
 msgstr "Caut� �nainte"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Salveaz� c�utarea"
 
@@ -28706,22 +29064,22 @@ msgstr "Mesaj"
 msgid "Don't show this message again."
 msgstr "Nu ar�ta acest mesaj din nou"
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Leg�tura DN:"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 #, fuzzy
 msgid "Clear"
 msgstr "�terge"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 #, fuzzy
 msgid "Find Now"
 msgstr "Leg�tura DN:"
@@ -28736,19 +29094,138 @@ msgstr "Serverul personal agend� de adrese"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Serverul personal calendar; procesatorul pentru calendar"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nu pot ini�ializa GNOME_VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nu pot ini�ializa GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 
 #, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Mut�..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Datele �nt�lnirii s-au schimbat. Trimit o versiune actualizat�?"
+
+#, fuzzy
+#~ msgid "_Delete this Appointment"
+#~ msgstr "�terge aceast� �nt�lnire"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Publicist: %s\n"
+#~ "Subiect: %s"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Eroare I/O"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "R�spuns de eroare: %s: probabil nu e fatal"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Comanda HELO a expirat: %s: nefatal"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "R�spuns de eroare la comanda HELO: %s: nefatal"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Comanda QUIT a expirat: %s: nefatal"
+
+#~ msgid "Insert File"
+#~ msgstr "Insereaz� fi�ier"
+
+#, fuzzy
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Oops. A�i ales o dat� invalid�."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Data mesajului va fi comparat� indiferent dac�\n"
+#~ "filtrul ruleaz� sau dosarul v este deschis."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor de �tiri Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Sunte�i sigur c� dori�i s� �terge�i acest cont nou?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Trebuie s� configura�i un cont �nainte pentru a putea s� trimite�i acest "
+#~ "mail"
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Server NNTP"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Dosar _nou"
+
+#~ msgid "Source"
+#~ msgstr "Surs�"
+
+#~ msgid "Source Information"
+#~ msgstr "Informa�ie surs�"
+
+#~ msgid "newswindow1"
+#~ msgstr "fereastra-�tiri1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Salveaz� pe disc..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Salveaz� mesajul ca..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Creare dosar nou"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Tipul fi�ierului selectat nu e valid pentru\n"
+#~ "opera�ia cerut�."
+
+#, fuzzy
+#~ msgid "_Contact List"
+#~ msgstr "_Contact"
+
+#, fuzzy
+#~ msgid "Inline Text _File..."
+#~ msgstr "Insereaz� fi�ier text..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Insereaz� un fi�ier ca text �n mesaj"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Insereaz� fi�ier text..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Trimite mai t�rziu"
+
+#~ msgid "Send _later"
+#~ msgstr "Trimite mai t�rziu"
+
+#~ msgid "Send the message later"
+#~ msgstr "Trimite mesajul mai t�rziu"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Set�ri _pilot..."
+
+#, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Surse agend�"
 
@@ -28875,10 +29352,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Op�iuni avansate LDAP "
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Fi�ier semn�tur�:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "�terge tot �n afar� de semn�tur�"
 
@@ -29198,12 +29671,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "_Mobile"
 #~ msgstr "_Mobil"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Creaz� o �nt�lnire nou�"
-
-#~ msgid "Create a new task"
-#~ msgstr "Creaz� o sarcin� nou�"
-
 #, fuzzy
 #~ msgid "New _Task"
 #~ msgstr "Sarcin� nou�"
@@ -29296,9 +29763,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ "Aceasta v� va conecta la serverul POP folosind Kerberos 4 la "
 #~ "autentificare."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Autentificare nereu�it� la serverul KPOP: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Nu m� pot conecta la serverul: %s"
 
@@ -29337,10 +29801,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "�n sau �nainte"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Nu m� pot conecta la serverul: %s"
-
-#, fuzzy
 #~ msgid "New _Mail Message"
 #~ msgstr "Mesaj _mail"
 
@@ -29385,10 +29845,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgstr "Organiza�ie:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "Memorez aceast� parol�"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Trimite implicit mail �n format HTML."
 
@@ -29971,9 +30427,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "This is an event that can be added to your calendar."
 #~ msgstr "Acesta e un eveniment ce poate fi ad�ugat �n calendar."
 
-#~ msgid "This is a meeting request."
-#~ msgstr "Aceasta e o cerere de �nt�lnire."
-
 #~ msgid "This is one or more additions to a current meeting."
 #~ msgstr "Aceasta e o ad�ugare (sau mai multe) la o �nt�lnire curent�."
 
@@ -30182,9 +30635,6 @@ msgstr "init_bonobo(): nu pot ini�ializa Bonobo"
 #~ msgid "Set task view preferences"
 #~ msgstr "Seteaz� preferin�ele de vizualizare a sarcinilor"
 
-#~ msgid "Tasks Preferences..."
-#~ msgstr "Preferin�e sarcini..."
-
 #~ msgid "TasksPreferences"
 #~ msgstr "Preferin�e task"
 
diff --git a/po/ru.po b/po/ru.po
index ff4382eca0..e90de44658 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-01-30 02:21+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -35,7 +35,7 @@ msgstr "����������� ����� VCard � Evolution."
 msgid "File As"
 msgstr "������� ���"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "���"
@@ -343,45 +343,45 @@ msgstr "VCard ��� %s"
 msgid "Could not initialize Bonobo"
 msgstr "�� ������� ���������������� Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "�����..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "��������..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "������ � ���������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "�������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "�������� �������� � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "��������� �������� �� ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "���������� ������."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "��������� ����������� ������ � ������� LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "�� ������� ��������� ������ �������"
 
@@ -474,11 +474,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "��������"
 
@@ -494,22 +494,31 @@ msgstr "������ LDAP"
 msgid "LDAP server containing contact information"
 msgstr "������ LDAP, ���������� ���������� ����������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "������� �������"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "�������"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "������� ����� �������"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "������� ������ ���������"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "������ ���������"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "������� �������"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "�������"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "������� ������ ���������"
 
 #: addressbook/gui/component/addressbook-config.c:197
 msgid "Failed to connect to LDAP server"
@@ -531,30 +540,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "����� ������� IMAP �� �������� ���������� � %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "����� ������� IMAP �� �������� ���������� � %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(� ���� ������ Evolution SSL �� ��������������)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "�� ������� ���������������� gnome-vfs"
 
@@ -563,11 +572,11 @@ msgstr "�� ������� ���������������� gnome-vfs"
 msgid "Other Contacts"
 msgstr "��������"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "�� ������� ������� �������� �����"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -577,7 +586,7 @@ msgstr ""
 "��� ���� �� ����� �������� URI, ���� ������ LDAP\n"
 "�� ��������"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -590,7 +599,7 @@ msgstr ""
 "��������� OpenLDAP, ������� ����� ����� �� �����������\n"
 "���� ������.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -598,42 +607,42 @@ msgstr ""
 "�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
 "� ��� � ��� ������� ����������� ����� �������."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "������� ������ ��� %s (������������ %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "��� ���������� �"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "��.�����"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "��������� "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "����� ���� ��������"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "�����������..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "����� ���������"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ������� ����� ������������ ��������� ��������� �����"
 
@@ -753,7 +762,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "��������� �������� ����"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "������"
@@ -845,8 +854,8 @@ msgstr "���������"
 msgid "Mappings"
 msgstr "����"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "�������"
 
@@ -899,8 +908,8 @@ msgstr "�������� ������: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "�����"
 
@@ -1089,15 +1098,15 @@ msgid "Using email address"
 msgstr "��.�����:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "��������"
 
@@ -1141,12 +1150,12 @@ msgstr "�� ������������ SSL/TLS"
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "������"
@@ -1261,10 +1270,10 @@ msgstr "������� ��� ���������� ������ ����� � �������� �����."
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "�������"
 
@@ -1293,42 +1302,15 @@ msgstr "(%d �� ��������)"
 msgid "Unnamed Contact"
 msgstr "���������� �������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "������� �������� �� �������� �����"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "\"�����������\" ��������"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution �� � ��������� �������� � ��������� �������� ������.\n"
-"��� ����� ���� ������� ����� ���������� �������� �����.\n"
-"����� ������ ������� ����� ������ � ������� ������ ��� ��������,\n"
-"����������, ������� ������ ��� Jon Trowbridge <trow@ximian.com>\n"
-"� ��������� ��������� �������, ��� ������� ������ ������\n"
-"���������. �������."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution �� � ��������� �������� � ��������� �������� ������.\n"
-"� ���������� �������� ��� ������� �� ������ ���������.\n"
-"���������� ��������� ������ Evolution � ��������� ��� ������."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "������� �������� �� �������� �����"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "������� �����"
@@ -1350,15 +1332,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "�����������..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "���������:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "�����:"
 
@@ -1464,11 +1441,12 @@ msgstr "�������� �������� ����� � ������� HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "�������"
 
@@ -2701,7 +2679,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "�������� ������ ��� �������� ����� � ���� ������"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "�������"
 
@@ -2764,7 +2742,7 @@ msgstr ""
 "���������� � ���� �����. �ӣ ����� ������ ��������?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "����������� �����"
 
@@ -2792,21 +2770,21 @@ msgid "Error getting book view"
 msgstr "������ ��� �������� %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "������ ��� ��������� ��������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "����������� ������"
 
@@ -2814,8 +2792,8 @@ msgstr "����������� ������"
 msgid "Repository offline"
 msgstr "����������� ��� ����"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "����� � �������"
 
@@ -2832,7 +2810,7 @@ msgid "Protocol not supported"
 msgstr "�������� �� ��������������"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2855,46 +2833,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "���� \"%s\" �� ����������."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "���� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "������ ��������� ���������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "������ ��� ���������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "������ ��� ���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "������ ��� ��������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "������ ��� �������� ������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "������ ��� �������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "�������� ��������?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "���������� ��������"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2902,19 +2885,19 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "����������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "���������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "����������� �������� �"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "���������� �������� �"
 
@@ -2986,7 +2969,7 @@ msgstr "�������� �����"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "��������� ��� VCard"
 
@@ -3020,7 +3003,7 @@ msgid "Pilot Settings..."
 msgstr "��������� Pilot..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "��������� �������"
 
@@ -3029,8 +3012,8 @@ msgid "Send Message to Contact"
 msgstr "��������� ��������� � ��������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "����������"
@@ -3048,7 +3031,7 @@ msgid "Move to folder..."
 msgstr "����������� � �����..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "��������"
 
@@ -3059,20 +3042,20 @@ msgid "Copy"
 msgstr "�����������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "��������"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "�������"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "����������"
@@ -3241,7 +3224,7 @@ msgstr "����"
 msgid "Number of columns:"
 msgstr "����� ��������:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "���������"
 
@@ -3331,26 +3314,26 @@ msgstr "��������������� �������"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "�������"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "����������"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "������"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "������������"
@@ -3474,11 +3457,11 @@ msgstr "��������� ����� (�����)"
 msgid "_Edit appointment"
 msgstr "������ �������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "�������� ����������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3490,13 +3473,13 @@ msgstr ""
 "������ ����� Evolution ��������� ���������� ������\n"
 "�����������."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "��������������"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3513,7 +3496,7 @@ msgstr ""
 "\n"
 "�� �������, ��� ������ ��������� ��� ���������?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "�� ���������� � ��������� ���."
 
@@ -3541,7 +3524,7 @@ msgstr "�������� ��������"
 msgid "Comment contains"
 msgstr "����������� ��������"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "������"
 
@@ -3552,7 +3535,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -3574,19 +3557,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "�� ������� ������� ���� ���������. ���������� ��������� ��������� ORBit � "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "������"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "����������������"
@@ -3611,37 +3594,37 @@ msgstr "�"
 msgid "W"
 msgstr "�"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "��������"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "�����"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "�� ������"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "� ��������"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3652,56 +3635,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "���"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "����������"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "���������"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "��"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "���"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "��� ����"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "��� ������� ������"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "��� ������"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "��� �����"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "���������"
 
@@ -3709,12 +3691,12 @@ msgstr "���������"
 msgid "Folder containing appointments and events"
 msgstr "�����, ���������� ������� � �������"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "������"
 
@@ -3722,40 +3704,58 @@ msgstr "������"
 msgid "Folder containing to-do items"
 msgstr "����� ���������� �������� \"���������\""
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "������� �������"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "�������"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "������� ����� �������"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "����� ���������"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "���������"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "������� ����� ������"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "������� ������"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "������"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "������� ����� ������"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "������� �������"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "�������"
+msgid "Create a new all-day appointment"
+msgstr "������� ����� �������"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3823,7 +3823,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "� �����������:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "���"
 
@@ -3831,11 +3832,13 @@ msgstr "���"
 msgid "extra times every"
 msgstr "�������������� ����� ������"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "����"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "������"
 
@@ -3963,7 +3966,7 @@ msgstr "�����������"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�������:"
 
@@ -3992,7 +3995,7 @@ msgstr "���������� �������"
 msgid "hour(s)"
 msgstr "���(-�,-��)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "������(-�)"
 
@@ -4167,7 +4170,7 @@ msgid "_Fri"
 msgstr "���"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "�����"
 
@@ -4209,19 +4212,33 @@ msgstr "���"
 msgid "before every appointment"
 msgstr "�� ������ �������"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "������ ��������� ���������. ��������� �����̣���� ������?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� �������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� ������?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�� ������� � ���, ��� ������ �������� � ������� ��� ������ � �������?"
 
@@ -4289,61 +4306,61 @@ msgstr " (� "
 msgid "Due "
 msgstr "����������� ����"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "�� ������� �������� ������!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "������� �������"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "������ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "������ � ������� - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "��� �������� ��������"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "�� ������� ��������� ������� ������!"
 
@@ -4547,7 +4564,7 @@ msgid "Member"
 msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4559,7 +4576,7 @@ msgstr "����"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���������"
@@ -4642,7 +4659,7 @@ msgstr "�"
 msgid "first"
 msgstr "������"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "�������"
 
@@ -4662,7 +4679,7 @@ msgstr "���������"
 msgid "Other Date"
 msgstr "������ ����"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "����"
 
@@ -4760,20 +4777,26 @@ msgstr "% ���������"
 msgid "Date Completed:"
 msgstr "���� ����������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "����������� ��������"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "�����������"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "���������:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "���������:"
 
@@ -4787,7 +4810,7 @@ msgstr "��������"
 msgid "Assignment"
 msgstr "����������"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4856,76 +4879,76 @@ msgstr ""
 msgid "100%"
 msgstr "1:00"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "�������� ��������� ��������"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "��������� ���..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "����������..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "�����������"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "��������"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "��������� ������"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "��������� ��� i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "�������� ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "�������� ��������� ������ ��� �����������"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "������� ��������� ������"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "���������� ��������"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�������� ����� ����� �������� ������"
@@ -4934,8 +4957,8 @@ msgstr "�������� ����� ����� �������� ������"
 msgid "Alarms"
 msgstr "�������"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "���������"
 
@@ -4964,11 +4987,9 @@ msgstr "���������"
 msgid "Start Date"
 msgstr "���� ������"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "�������"
 
@@ -5011,105 +5032,104 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "����� �������"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "����� ���������� �������"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "����� ���������"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "������� ������"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "����������..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "������� � ������������ ���"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "������� � ����..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "���������..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "��������� Pilot..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "��������� ���..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "�������� ��������� � ����������"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "��������� ��� i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "������� ��� ��������� ������������"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "������� ��� ���������"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "������, ������� GNOME Pilot �� ����������� � ���� �������"
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "������ ���������� %s."
@@ -5154,7 +5174,7 @@ msgstr " (��������� "
 msgid "Task Due: <b>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "���������� ���������"
@@ -5165,359 +5185,364 @@ msgstr "���������� ���������"
 msgid "iCalendar Error"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "����������� �������"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "�����.������������: "
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "���������:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�����������������"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "�����������"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "�������� ������"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "��"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "�������"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�����������������"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "���������"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "���������� ���������"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "�������� ��������� ���������� �� ���������"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 #, fuzzy
 msgid "Meeting Information"
 msgstr "�������������� ����������"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "��������� ��.�����"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 #, fuzzy
 msgid "Meeting Update"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "�������� ��������� ���������� �� ���������"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "�������� ��� ��������� ������"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "������� ��������"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "����� � ���������"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "�������� ��������� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Task Information"
 msgstr "����������"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 #, fuzzy
 msgid "Task Update"
 msgstr "������ �����"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "�������� ��������� ���������� �� ������"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 #, fuzzy
 msgid "Task Reply"
 msgstr "��������� �����"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "�������� ��������"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "��������� ���������"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "������������ ���������� � ���������"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL \"��������/�����\":"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL \"��������/�����\":"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "����������� ���������"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "������, ����� ������������� ���������."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "��� ��������� �������� ������ ����������� ������� �����."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "���������� ���������\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "���� ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣�, ������ ��� ������� ������ �� "
 "����������"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "������ ��������� �� ����� ���� �����̣� ��-�� ��������� �������� �������!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "������ ��������� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "������ ��������� �� ����� ���� �����̣�!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "�������� ���������"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "������� ���������!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "������� �� ����� ���� ������!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 msgid "Select Calendar Folder"
 msgstr "������� ����� ���������"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 msgid "Select Tasks Folder"
 msgstr "������� ����� �������"
 
@@ -5562,7 +5587,7 @@ msgstr "����-������"
 msgid "Chair Persons"
 msgstr "������������"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "����������� ���������"
 
@@ -5575,57 +5600,52 @@ msgid "Non-Participants"
 msgstr "�� ���������"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "�������������"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "������"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "��������"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "�������"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "������������"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "��������� ���������"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "�������������� ���������"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "�� ���������"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "����������� ��������"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�����������������"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "��������"
 
@@ -5715,47 +5735,44 @@ msgstr "����� ������ ��������:"
 msgid "Meeting _end time:"
 msgstr "����� ���������� ��������:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "�������� ����� %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "�� ������� ��������� ������ � \"%s\""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "�� ������� ������� ����� \"%s\""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "����������� � �������..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 msgid "Deleting selected objects..."
 msgstr "�������� ��������� ��������..."
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "��������"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "����� �������..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "������� ��� �������"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5766,11 +5783,16 @@ msgstr "�� ������� ������� ����� \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "�����, ����������� ��� �������� \"%s\", �� ��������������"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "�������� ��������� %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�������� ����� \"%s\""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "������"
@@ -5827,58 +5849,63 @@ msgstr "�������"
 msgid "September"
 msgstr "��������"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "��������� ��� ������� ���� ��������"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "����������� ������ ���� ��������."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "����������"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "�������������� ����������"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "���������� � ��������� (� %s �� %s)"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "���������� ���������"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "�������� ������"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "�� ������ ���� ���������� �������."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "�� ������� ���������������� Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "�� ������� ������� ������� �������������� ����������"
 
@@ -6109,9 +6136,8 @@ msgid "Print Calendar"
 msgstr "���������� ���������"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "���������� ��� �� ������"
 
@@ -6145,8 +6171,8 @@ msgstr ""
 "\n"
 "���������� ��� �������?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "�� ���������� �����."
 
@@ -6206,17 +6232,29 @@ msgstr "����������� ����� iCalendar � Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "����������� ����� iCalendar � Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"���������� �������� ���������: %s �� ����� %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "���������� ������������ � �������: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "�����������"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��������� ���������"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6225,83 +6263,83 @@ msgstr ""
 "���������� �������� ����� Pine.\n"
 "������ ������������� �� � Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "��������� Gnome"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now �� ������������ ����������"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time ������������ 1 ��������"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time ������������ ������ � �������� ��������� 1"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "�������� 1 make-time ������ ���� ������� ���� � ������� ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day ������������ 2 ���������"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day ������������ ����� ����� � �������� ��������� 2"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin ������������ 1 ��������"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end ������������ 1 ��������"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype �� ������������ ����������"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? ������������ 2 ���������"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? ������������ ��� time_t � �������� ��������� 2"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? ������������ ��� ���������"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 1"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ������������ ������ � �������� ��������� 2"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6309,11 +6347,11 @@ msgstr ""
 "contains? ������������ ���� �� \"any\", \"summary\", \"description\" � "
 "�������� ��������� 1"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? ������������ �� ������� ���� 1 ��������"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6321,19 +6359,19 @@ msgstr ""
 "has-categories? ������������, ��� ��� ��������� - ������ ��� ����-"
 "������������ �������� - ���������� ���� (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? �� ������������ ����������"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? ������������ 1 ��������"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? ������������ ��� time_t � �������� ��������� 1"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "���������� ��������� ������ �� ������ ����������� ��������"
 
@@ -7929,71 +7967,81 @@ msgstr "���������� ����� \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr "��� ���������� ������ �������� ���������� ����������� � ����"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���������� ��������� ������: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "������ ���������� �������: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "�� ������� ������� ����� �����"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "�� ������� ���������� ����� �����"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "��������� ��������� %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "���������� ������� ���������"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "���� �� ��������� %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "������������� �����"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "��������� ��������� %d �� %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "�� ������� �������� ���������"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "������������ ���������"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "������������ ���������"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "������ ���������� ������ �������: %s: %s"
@@ -8050,7 +8098,7 @@ msgstr "����������� ���������"
 msgid "Copying messages"
 msgstr "����������� ��������� � %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8058,47 +8106,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "��������."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "����������� ����� �� ������� POP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "�� ������� ��� �����."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "���������� ����������� ��� ���������: �� ���������� ����������"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8106,18 +8154,18 @@ msgid ""
 "%.*s"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "���� ��� ����������� ��������� %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�� ������� ������������ ���������."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8144,24 +8192,24 @@ msgid "Could not lock '%s'"
 msgstr "�� ������� ������������� \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�� ������� ������� ���� ���������� ��� %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "���������� ������� �������� ��� ������� ������������� ���� %s. ���������� "
 "��� ��� �����."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "�� ������� �������� ���������� ��������� fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�� ������� �������� ���������� ��������� flock(2): %s"
@@ -8220,11 +8268,15 @@ msgstr "������ ���������� ���������� ��������� �����: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "������ ����������� ���������� ��������� �����: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8360,7 +8412,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "�������� ����� �� ������� ��� ��������������."
 
@@ -8536,31 +8588,134 @@ msgstr "�� ������� �������� �����: ������������ �������� � ���� ���������"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�� ������� ������� �����: ������������ �������� � ���� ���������"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "�� ������� ��������� �����������."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "�� ������� ��������� �����������."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"�������� ���������� �� %s:\n"
-"\n"
-"%s\n"
-"\n"
-"�ӣ ����� �������?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "������� ���� �������"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "������������� �����������:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "������ ��� �������� %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "��� �����"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "�� ������� ��������� �����������."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "������������� �����������:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "������������ ��������"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "������������� �����������:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "������������� �����������:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8569,16 +8724,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"�������� ���������� �� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"�ӣ ����� �������?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8598,32 +8770,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "�� ������� ��������� URL \"%s\""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "������ ��� �������� %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "��� ��������� %s � %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "��������� ����� ����� �� ���� ������"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "�� ������� ������� �����: %s: ������������ ��������"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "�� ������� ������� �����: %s: ��� ����� �����"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�� ������� ������������� �����: %s: ������������ ��������"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "�� ������� ������������� �����: %s: ��� ����� �����"
@@ -8631,12 +8808,12 @@ msgstr "�� ������� ������������� �����: %s: ��� ����� �����"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "�������� ��������"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "������ ���������� ����������: %s"
@@ -8665,40 +8842,40 @@ msgstr "����� ������� IMAP �� �������� ���������� � %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "����������� ����� \"OK\" �� ������� IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "�� ������� ������� ������� %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "�� ������� ��������� ������� ���������� � %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "����� �������� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "��� ��������� � ��������� ������ ����������"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "��������� ������� ���������� �� ����� ���������� "
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "����� ����� ���������"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "�� ������� ����� ���� ��������� � ������ �� ������� FETCH."
 
@@ -8707,10 +8884,10 @@ msgstr "�� ������� ����� ���� ��������� � ������ �� ������� FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "�� ������� ������� ������� ����: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "���� ��� ����������� ��������� %s: %s"
@@ -8723,7 +8900,7 @@ msgstr "�������� ����� �����"
 msgid "Check for new messages in all folders"
 msgstr "��������� ����� ����� �� ���� ������"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "�����"
 
@@ -8754,7 +8931,7 @@ msgstr "��� ������ � �������� ����� �� �������� IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "������"
 
@@ -8764,70 +8941,74 @@ msgstr ""
 "����������� � ������� IMAP ����� ������������� � �������������� "
 "���������������� ������."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s ������ ��� %s �� %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "���������� ��������"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "�� ������� ������������ � %s (���� %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "�� ������� ������������ � ������� SMTP %s � ���������� ������: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "���������� SSL/TLS �� ��������������."
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "���� ��������������."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "����� �� �����"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "������ IMAP %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "�������������� %s �� ��������������"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "�� �� ����� ������."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8838,31 +9019,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "��� ����� ����� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "�������� ����� �� ����� ��������� ������ �������� �������."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "��� ����� �� ����� ��������� ��������"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "���������� ������� �������� ����: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8884,7 +9071,10 @@ msgid "Local delivery"
 msgstr "��������� ��������"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "��� ��������� ��������� ����� �� ����� � ����������� ������� mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8912,13 +9102,13 @@ msgstr "����������� ���� Unix mbox"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "��� ������ � �������� ��������� ����� � ������ ������������ ����� mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8929,38 +9119,38 @@ msgstr "������������� ���� � ��������� %s"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "��������� ��������� �� ����� ����� ��������"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "��������� �������� ���� %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "�� ������� ������������� ����� %s � %s: %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�� ������� ������������� '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "�� ������� ������� ���� ������� ���������� � ����� \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "�� ������� ������� ��������� ���� ����� \"%s\": %s"
@@ -9020,7 +9210,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9058,25 +9248,25 @@ msgstr "�� �������� �������� ���������"
 msgid "Could not scan folder `%s': %s"
 msgstr "�� ������� �������������� ����� \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "���������� ������� ���� � ����� ��������� ��������: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "�������� ����������� �����"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "����� ����� ���������"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "���������� �����"
@@ -9120,7 +9310,7 @@ msgstr "������, ����� ������������� ���������."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "���� ��� �������� ���������: �������� ���� ���������?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9129,7 +9319,7 @@ msgstr ""
 "�� ������� ������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9138,14 +9328,14 @@ msgstr ""
 "�� ������� ������� ���� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" �� �������� ������� ������."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9154,7 +9344,7 @@ msgstr ""
 "�� ������� ������� ����� \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "����� \"%s\" �� �����. �� �������."
@@ -9169,64 +9359,64 @@ msgstr "�� ������� ������� �����: %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "��������� ������ ��������� ����������� ����� ������� %ld � ����� %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "���������� ��������� �����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "�� ������� ������� ����: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "���������� ������� ��������� �������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "�� ������� ������� �������� ����� %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�� ������� ������� ��������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�� ������� ������������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "������������ ����� � ������� ���������� � ��� ���� ����� �������������"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "����������� ������: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�� ������� ������������� �����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "������ ������ �� ��������� �������� ����: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "���� ������ �� ��������� �������� ����: %s: %s"
@@ -9377,47 +9567,47 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr "���� ��������: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "��������� ������� ���������� �� ������� POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�� ������� �������� �����: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "����������� ���������, ���������� ��� ���̣����"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "��� ��������� � uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "��������� ��������� %d �� POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "���������� �������� ��������� %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "����������� �������"
 
@@ -9434,7 +9624,7 @@ msgstr "��������� ��������� �� �������"
 msgid "Delete after %s day(s)"
 msgstr "������� ����� %s ����"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9461,6 +9651,11 @@ msgstr ""
 "������ �� ��������� APOP. ��� ����� �������� �� ��� ���� ������������� ���� "
 "�� ��������, ������� ����� ������������ ���."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "�� ������� ������������ � %s (���� %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9469,55 +9664,57 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "�� ������� ������������ � ������� POP %s � ���������� ������: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
-#, c-format
-msgid "Could not connect to POP server on %s"
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "�� ������� ������������ � ������� POP �� %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "�� �������������� ������������� �������� �������������."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "���� ������� IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
-#, c-format
-msgid "I/O Error: %s"
-msgstr "������ �����/������: %s"
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "�� ������� ������������������� �� ������� KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s����������, ������� ������ POP ��� %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "�� ������� ������������ � ������� POP.\n"
 "������ �������� ������: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "��� ����� ����� \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9541,35 +9738,35 @@ msgstr "�� ������� ������� ����� � Sendmail: %s: ����� �� ����������"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�� ������� ��������� Sendmail: %s: ����� �� ����������"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�� ������� ��������� ���������: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail �������� ������ � �������� %s: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "�� ������� ��������� %s: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail ��������� ������ � ����������� %d: ����� �� ����������."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "�������� ����� ����� ��������� sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9681,42 +9878,42 @@ msgstr "��������� ���� ��������������"
 msgid "Authentication required"
 msgstr "��������� ��������������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "������ �� ������ ����������: %s: ������ �����, ��� �� ��������"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "������ ��� ������ �� 'QUIT'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: 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"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ������ %s �� ������������ ������������� ��� �������������� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9727,89 +9924,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ������ %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�������� SMTP ����� ����� %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "���������� ��������� ���������: �������� ����� �����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "�������� ���������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "���������� ��������� ���������: �� ���������� ����������."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "���������� ��������� ���������: ���� ��� ����� ������������ �����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "����������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "������ ������ HELO: %s: �� ��������"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "������ ��� ������ �� 'RSET'"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "�������������� SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "������ ��� �������� ������� �������������� SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "������ ������� AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "�������� ����� �� ������� ��� ��������������.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "������ ��� ������ �� 'MAIL FROM'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� RCPT TO: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "���� 'RCPT TO <%s>'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
@@ -9817,87 +10014,87 @@ msgstr "��������� ����� �������� ������ �� 'DATA': %s: ����� �� ����������"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "������ ��� ������ �� 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "��������� ����� �������� ������ �� RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "������ ��� ������ �� 'RSET'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "������ ��� ������ �� 'QUIT'"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 ����"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u ����"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f�"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "������������ ����"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "������� ��������� �������� �� ������ ������������ ������"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "������������ ����..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "������������ ���� � ���������"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "���������� ������������ ���� %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "���������� ������������ ���� %s: ��������� ����"
@@ -9915,56 +10112,60 @@ msgid "MIME type:"
 msgstr "��� MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "������������ �������������� ����������� ������������� �����"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "�������� ����� ����� ������� �������� �����"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "��:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "��������:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "��:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "����:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "����������� ����������� ���������"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "�����:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "������� ���������, ������� ������� ����� ���������"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "���.�����:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9972,17 +10173,25 @@ msgstr ""
 "������� ���������, ������� ������� ����� ���������, �� ����� � ������ "
 "�����������."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "������� �"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "������������ ����"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "�� ������� ������� �������� ������� PGP"
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9991,34 +10200,34 @@ msgstr ""
 "������ ��� ������ ����� %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "��������������!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "���� ����������, ������������?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "������ ���������� �����: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "������ ��� �������� �����: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "������ ������� � �����: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "�� ������� �������� ��������� �� ���������"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10027,7 +10236,7 @@ msgstr ""
 "�� ������� ������������� �� �����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10036,7 +10245,7 @@ msgstr ""
 "�� ������� ����� ����: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10045,7 +10254,7 @@ msgstr ""
 "������ ��� �������������� ���������: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10053,7 +10262,7 @@ msgstr ""
 "���������� ����������� ����� ���������� ������.\n"
 "���������� ������� ��������������?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10063,43 +10272,39 @@ msgstr ""
 "\n"
 "��������� ���������?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "��������: �������� ���������"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "������� ����"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "�������� ����"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "�������"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (��������)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "������� ���������"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10107,7 +10312,7 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ����������� ������� ������ ������."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10115,9 +10320,9 @@ msgstr ""
 "�� ������� ������� ���� ���������:\n"
 "���������� ������������ ��������� ��������� HTML."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10179,8 +10384,8 @@ msgstr "���� ��������"
 msgid "Subject does not contain"
 msgstr "���� �� ��������"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10188,12 +10393,11 @@ msgstr ""
 "���� � ����� ��������� ��� ����������.\n"
 "������������ ���?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "��������� ���� ������"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "��������� ���� ������ �� ��������� ���� ������"
 
@@ -10291,150 +10495,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "���"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "����"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "�������"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "�����"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "������"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "������"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "���"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "������"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "������"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "���"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "�����"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "������"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "������"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "�������"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "���"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "����"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "�� ������ ������� ����."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "�� ������� ������������ ����."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"���� ��������� ����� ������������ ����\n"
-"�� �������� ������� �������, ���� \n"
-"�� �������� �������� ����������� �����."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"���� ��������� ����� ������������ � �����,\n"
-"������� �� ������� �����."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"���� ��������� ����� ������������ ��\n"
-"�������� ������������ ������� �������;\n"
-"�������� \"������ �����\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "������� �����"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "��������� ���� �����"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "����� ������������ ��������"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "������� ����� ��� ���������"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "���������� �"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<ݣ������ ����� ����� ������� ����>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "������"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " �����"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "�����"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a, %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " �����"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<ݣ������ ����� ����� ������� ����>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "������� ����� ��� ���������"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "������� �������"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "������� ��� �����:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "���� ����� \"%s\" �� ���������� ��� �� �������� ������� ������"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "������� ����"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "�����"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "�������� ��������"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10442,12 +10596,12 @@ msgstr ""
 "�� ������ ������� �����.\n"
 "����������, ��������� � ������� ���������� ����� ��� �������� �����."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "������� �����"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10456,92 +10610,167 @@ msgstr ""
 "������ � ���������� ��������� \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "������"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "���������"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "����"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "�����"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "��������"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "�� ������ ����������� ���� ������"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "�������� �������: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "���������������"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "����"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "��������� ��������"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "���� ������������� ���� ���������"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "���� ������������� ������ �� ���������"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "�������� ��������"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "��������"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "���������"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "���������� �"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "������� �������"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "������� ����������� �����"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "��������"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "���������"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"���� ��������� ����� ������������ � �����,\n"
+"������� �� ������� �����."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"���� ��������� ����� ������������ ��\n"
+"�������� ������������ ������� �������;\n"
+"�������� \"������ �����\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"���� ��������� ����� ������������ � �����,\n"
+"������� �� ������� �����."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "����������� �����"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "����� ������������ ��������"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "�����"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "������ ��������� �����"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "������� �����"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "��������� ���� �����"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "��������� ����������� �����"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "�� ����� ��������� ���̣����� �������"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "�� ����� ���������� � ��������� ���̣����� �������"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "�� ����� ���������� �������"
 
@@ -10568,42 +10797,42 @@ msgid "Beep"
 msgstr "�����"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "��������"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "����������� � �����"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "���� ��������"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "���̣����"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "�� ������������� ��"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "�� ����������."
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "�� ����������."
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "������ �� ���"
@@ -10625,88 +10854,84 @@ msgid "ends with"
 msgstr "������������� ��"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "����������"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "c���������"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "���������"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "������"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "���� �����"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "���� ��"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "�� ��������"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr "�����"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "������ ��������"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "���� ���������"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "��������� ���������"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "����������� � �����"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "��������� ��������� � ��������"
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "������������� ����"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�����������"
 
@@ -10722,57 +10947,86 @@ msgstr "���������� ���.���������"
 msgid "Replied to"
 msgstr "��������"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "������ ���"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "������ ���"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "���"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "�����������"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "��������"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "������ (��)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "������ ���"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�������� ������� ������"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "����������� ���������"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "���������� �"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "���������� ���������"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "����"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "���������� ���������"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�������"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "�������� �������"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "������ �������"
 
@@ -10780,11 +11034,11 @@ msgstr "������ �������"
 msgid "Score Rules"
 msgstr "������� ���������� �����"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "������� �������� ���� ����������� �����."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "������� ���� �� ���� ����� � �������� ���������."
 
@@ -10792,31 +11046,31 @@ msgstr "������� ���� �� ���� ����� � �������� ���������."
 msgid "Evolution is importing your old Elm mail"
 msgstr "�������������� ����� ����� �� Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "��������������..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "��������� ����������"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "�������������� %s � �������� %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "������������ %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "�����"
 
@@ -10877,37 +11131,37 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "�������������� ���������� �� Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "�����"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 msgid "Scanning mail filters"
 msgstr "������������ �������� ��������"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "������������ ��������"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "������ ��������������"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "���������"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 msgid "Mail Filters"
 msgstr "������� �����"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10987,11 +11241,11 @@ msgstr "������� ��� ���������� Mail Summary ��������� Evolution."
 msgid "Font Preferences"
 msgstr "��������� �������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Mail Accounts"
 msgstr "�ޣ���� ������"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11039,7 +11293,7 @@ msgstr "��������..."
 msgid "Change this folder's properties"
 msgstr "�������� �������� ���� �����"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11047,57 +11301,77 @@ msgstr ""
 "��������� ���� �������� ��������� �������� ������������, ����������, "
 "���������, ��� �ӣ � �������."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "�� �� ���������� ����� ��������������� �����"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "��������: �������� ���������"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "����� �������� ���������"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "�������� ���������..."
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "������� ���������"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "������� ���������"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "����������� ���������"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "����� �������� ���������"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "���������� ���������������� �������� ��������� Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "���������� ���������������� ��������� ��������� ����� Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "���������� ���������������� ��������� ���������� � ����� Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 msgid "Connecting..."
 msgstr "�����������..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "�� ������� ���������������� ��������� � ������� ��������"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "�������� ��� \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "��������"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "�� ������� ������� ��������� �������: %s"
@@ -11147,126 +11421,126 @@ msgstr "����� %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "������� ����������� ����� �� ���������"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "����������� ����� �� ����"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "����������� ����� �� �����������"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "����������� ����� �� ����������"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "������ �� ����"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "������ �� �����������"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "������ �� ������ ��������"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "������� ��� ����� ���������..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "����������"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�������� �����������"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�������� � ������"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�������� ����"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "���������"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "���������"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "�������� ����"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�������� ��� �����������"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "�������� ��� �������������"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "�������� ��� ������"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "�������� ��� ��������"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "������������"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "�������� ����������� � �������� �����"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "��������� �������"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "������� ������� �� ���������"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "����������� ����� �� ������ ��������"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "������ �� ������ �������� (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "����������� ����� �� ������ �������� (%s)"
@@ -11331,74 +11605,65 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "�� �� ����� ��� ����������� ����������."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "�������� �������� Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "�������� �ޣ���� ������� Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "������:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "��� ������������:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "����:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "�� �� ������ ������� ��� �ޣ���� ������ � ���������� ������."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "�� �������"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "������������� ������� �ޣ���� ������?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "���������"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "��������"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������ ��������?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "��������"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "�������� �ޣ���� ������"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "��������"
 
@@ -11407,30 +11672,30 @@ msgstr "��������"
 msgid "Mail to %s"
 msgstr "������� �����"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, fuzzy, c-format
 msgid "Subject is %s"
 msgstr "����"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "�� %s:"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "������ ��������"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "�������� ������� �������"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11442,7 +11707,7 @@ msgstr ""
 "    '%s'\n"
 "� ���� ���������."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11454,7 +11719,7 @@ msgstr ""
 "����������, ��������� ��� ������������� �����.\n"
 "�� ������ ��������� ��� ������?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11462,7 +11727,7 @@ msgstr ""
 "�� ������ ��������� ������������\n"
 "�� ����, ��� ������� ���������� �����."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11471,7 +11736,7 @@ msgstr ""
 "�� ����, ��� ������� ���������� �����."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11479,11 +11744,11 @@ msgstr ""
 "�� ��������� ��������� � HTML �������, �� ��������� ���������� �� ����� "
 "�������� ����� � HTML �������:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "�ӣ �� ���������?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11491,7 +11756,7 @@ msgstr ""
 "��� ��������� �� ����� ����.\n"
 "��������� ���?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11499,11 +11764,11 @@ msgstr ""
 "��� ��� ������ ����������� ��������������� �� �������� ������� �� ������, "
 "��� ��������� ����� ��������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "��� ��������� �������� ������ ����������� ������� �����."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11513,16 +11778,11 @@ msgstr ""
 "���������� Apparently-To ���������.\n"
 "�ӣ ����� ���������?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "�� ������ ������� �����������, ����� ��������� ��� ���������."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"�� ������ ��������� �ޣ���� ������ �� ����, ��� ������� ���������� �����."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11530,28 +11790,28 @@ msgstr ""
 "�� ������� ������� ����� ���������� ��� ���� ������� ������.\n"
 "������ ������������ ����� ���������� �� ���������?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "����������� �����������"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "� %a, %d.%m.%Y, � %H:%M, %%s �������:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "����������� ���������(�) �"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�� �������, ��� ������ ������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11559,7 +11819,7 @@ msgstr ""
 "�� ������ ������� ������ ���������,\n"
 "����������� � ����� \"���������\"."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11567,38 +11827,38 @@ msgstr ""
 "�� ������ ������������� ���������\n"
 "������ �� ����� \"������������\"."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�� �������, ��� ������ ������������� ��� %d ���������?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "��� ��������� ���������"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "������������ ����?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "��������� ��������� ���..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "������� � ��������� ����� � �������������� �����������?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11610,7 +11870,7 @@ msgstr ""
 "\n"
 "���������� ��� ���������?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11619,28 +11879,28 @@ msgstr ""
 "������ ��� �������� ���������� �������:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "��������� ��������"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "�������� %d �� %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "���������� ���������"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "���� ������ ���������"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
@@ -11661,7 +11921,7 @@ msgstr "��� ��������"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "���������� �������"
@@ -11682,20 +11942,21 @@ msgid "Add Signature"
 msgstr "�������"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "����������, ������� ���� ���� ��� � ��.�����. \"��������������\" ����\n"
 "�� ����������� ��� ����������, ���� ������ �� �� ������ ��������\n"
 "��� ���������� � ������������ ���� �����."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "����������, ������� ���� ���������� � ����� ������� �������� �����. ���� �� "
 "�� ������ ������ ���� ������ �� �����������, ��������� � ����� ��������� "
@@ -11706,24 +11967,23 @@ msgid "Please select among the following options"
 msgstr "����������, �������� �� ��������� ������������"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "����������, ������� ���� ���������� � ��� ����� ������� �� ������ ���������� "
 "�����. ���� �� �� ������,\n"
 "��������� � ����� ��������� ��������������� ��� ����������� ����� ��������."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "�� ����� ��������� ������� ��������� �����. ������������, ������ ��������\n"
 "����� � ����� �������� ��������� �����, ������� �� ������������\n"
@@ -11732,43 +11992,20 @@ msgstr ""
 "�������� ����� ������������ ������ ��� �����������."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "�������� �� �ޣ���� ������� Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "���������"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "����"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "�����"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�������� �ޣ���� �������"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "�������� �������"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "����������� � �������..."
 
@@ -12014,231 +12251,220 @@ msgstr "����� � �����"
 msgid "Loading Images"
 msgstr "��������� �����������"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "��������� �����"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "������������ ��������� �����"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "��������� ���������"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "����������� ���������"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "������ NNTP"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "��������� � ����� �����"
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr "������� ��������"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "�������������� ����������"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 msgid "Or_ganization:"
 msgstr "�����������:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "ID ����� PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "������� ����"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "������������� ��� �������� ���������, � ������� ���������� ������ ���������� "
 "������� �����."
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "���������� ��������� ��������"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "�������� ������� Qmail "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "���������� ������� ���������"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "�������������"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "��������� ���� ������"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 msgid "Re_ply-To:"
 msgstr "��������:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 msgid "Receiving _Options"
 msgstr "��������� ���������"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 msgid "Remember this _password"
 msgstr "��������� ���� ������"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "����������� ����������"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "������� ��������"
+
+#: mail/mail-config.glade.h:101
 msgid "S_ecurity"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "���������� MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 msgid "Select PGP program"
 msgstr "������� ��������� PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "����� ������������ ���������:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "������������ ��������� � ���������"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "������ ������� �������������"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "��������� �������"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "��� �������:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "������"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "��������"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "���������� �� ���������"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "������� ��� �����:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "�������� ����������"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "����������� ���� Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12248,190 +12474,186 @@ msgstr ""
 "\n"
 "������� \"����.\" ��� ������."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "������ ��������� �����������"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "������ ����������� ���������, ����� ������������ ��� �ޣ���� ������"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "��� ��������������: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "������������� ��������� ����� �����"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr "����� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "������������� �����������:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "������������ ����������� ���������, ���������� ��� ���̣����, � �����"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "���� ������� � ��������� ������� "
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "������� ��������"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr "�� ������������� ��� ������� ����� �����"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "��������� ���"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "������ ���:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 msgid "_HTML Mail"
 msgstr "����� � ������� HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 msgid "_Identity"
 msgstr "�����������"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "��������� �����������, ���� ����������� ���� � �������� �����"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "������� ���� �������� �ޣ���� �������"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "�������� ��������� ��� \"�����������\" �����:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "���:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "������� �� ��������� �����������"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "���� � ��������� PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr "������������� �������� ���� �� �������� ����� �����"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "������������� ��� �������� ��������� � ������� HTML ���, ��� �� ������ �����"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "������������� ��� �������� ��������� � ������ �����"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 msgid "_Receiving Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�������� ����"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "������������"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 msgid "_Sending Mail"
 msgstr "�������� ��.�����"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 msgid "_Show animated images"
 msgstr "�������� ������������� �����������"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "�������"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 msgid "_Use secure connection (SSL):"
 msgstr "������������ ���������� ���������� (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "����������"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "������"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 msgid "color"
 msgstr "����"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "��������"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12455,199 +12677,209 @@ msgstr "�� ������� ������� �������� �������� S/MIME"
 msgid "Could not create a S/MIME decode context."
 msgstr "�� ������� ������� �������� ������������� S/MIME"
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "��������� ������������ ����"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�� ������� ������� ��������� ���� '%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "��������� �� �����..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "��������� ������������ ����"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "���������� ��������"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "������� � %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "���������� �������� (����� %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "������"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "������� ��������� ���������"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "��������� �����������"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "�������� ����������� ���������"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "������������ ������:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "������� ������ � ��������"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "����������� ������"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "��������� ������ ���"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "��������� ����������� ���..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ������������ ����"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "����"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "�������� ��.�����"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "��"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "��������"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "����"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "�����"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "���.�����:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 msgid "Mailer"
 msgstr "�������� ������: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "��������� ��������� ���..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�� ������� ������� �������� �������� PGP"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "��������� �� FTP ���� (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "��������� �� ��������� ���� (%s), ��������� �� ����� \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "��������� �� ��������� ���� (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "��������� �� ���̣���� ������ (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "����� external-body ������� ������������"
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "��������� �����"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "������������� �����"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "���������� ��������� ���������� �����, ��������, �� ����������\n"
 "��� ������ �� ������ ������� ��� �����: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "���������� ��������� ���������� ����� � %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "���������� ������� ���������� ����� %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "��������� ����� \"%s\" � ������ \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 "%s ����� �� ��������� �������������, ��� ��� �� �������� ��������� ������"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12655,16 +12887,16 @@ msgstr ""
 "���� �� �� ������ ������ ������� ���� ����,\n"
 "��������, ��� ���ģ��� ������������ ��� �������."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "�� �� ������ �������� ������ ����������� �����."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "������������� /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12673,7 +12905,7 @@ msgstr ""
 "������ ��� \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12682,7 +12914,7 @@ msgstr ""
 "������ ��� ���������� ��������:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "���������"
 
@@ -12690,100 +12922,100 @@ msgstr "���������"
 msgid "Filtering Folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "��������� ��.�����"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "������, ��������� ���� ������� ����������."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "�������� \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "�������� ��������� %d �� %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "���� �� ��������� %d �� %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "���������."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "���������� ��������� � �����"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "����������� ��������� � %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "������������ ����� �� \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "����������� ���������"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "�������� ��������� %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "�������� ����� \"%s\""
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "���������� ����� \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "���������� �����"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "�������� �����"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "��������� ��������� %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "��������� %d ���������"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "���������� %d ���������"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12792,7 +13024,7 @@ msgstr ""
 "���������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12801,11 +13033,11 @@ msgstr ""
 "������ ���������� ��������� �: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "���������� ������������� �����"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12814,27 +13046,22 @@ msgstr ""
 "�� ������� ������� ���� ������: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�� ������� �������� ������: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���������� �� %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "��������������� � %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "���������� ������� ��������: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "�����"
 
@@ -12889,32 +13116,41 @@ msgstr "����: %s, ���: %s"
 msgid "Type: %s"
 msgstr "���: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "��������� � �������� �����"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "�������� ���"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "����������..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "��������..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "�������� �������� �������������."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "��������� ���� ������"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "��������� ���� ������ �� ��������� ���� ������"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "������� ������ ��� %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "���� ������"
 
@@ -12941,7 +13177,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "��������:"
 
@@ -12971,7 +13207,7 @@ msgstr "����������� ��������� - %s"
 msgid "Forwarded message"
 msgstr "����������� ���������"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "����������� ���������"
 
@@ -12985,7 +13221,7 @@ msgstr "��������� ����������� �����: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "���������� ����������� ����� ��� uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12998,94 +13234,97 @@ msgstr ""
 "    '%s'\n"
 "� ���� ���������."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "����������� �����"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "����.�����"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "������� ����������� �����"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "������� �������������� �������������� ����������� ����� \"%s\"."
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "����� ����������� �����"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(��� ����)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - ���������"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "�����������"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "���������"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "��������"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "��������� ������������� ���������"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "��������� ���������"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "����� ������"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "������"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "�������"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "����� �������"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "������� %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "����� %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "�������� ������ ���������"
 
@@ -13120,46 +13359,46 @@ msgstr "���� ���������"
 msgid "Size"
 msgstr "������"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "�������� ������"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "�� ����������"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "���������� �� ���������"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "���������"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "��������"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�������� ����"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "��������������� ��������"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13183,16 +13422,16 @@ msgstr "�������� �� ����� \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "����������� �� ����� \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "�����"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "�� ��� ������ ������"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "����������, �������� ������."
 
@@ -17654,11 +17893,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23074,8 +23313,8 @@ msgstr "��� ��������"
 msgid "Mail summary"
 msgstr "������� ���������� � �����"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "��������� �����"
 
@@ -23093,15 +23332,15 @@ msgstr "UWWW"
 msgid "Dictionary.com Word of the Day"
 msgstr "����� ��� � Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "������ ���"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "�������� ����� ��������"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "���� URL ��������� ��������, ������� �� ������ ��������"
 
@@ -23113,26 +23352,26 @@ msgstr "������ ��� �������� RDF"
 msgid "News Feed"
 msgstr "�������� ��������"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "���"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "��������"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�����"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "��� �����"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(��� ��������)"
 
@@ -24405,7 +24644,8 @@ msgid "Tasks "
 msgstr "������ "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "��������� ������"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24462,7 +24702,7 @@ msgstr "���������� �����������"
 msgid "Cancel Operation"
 msgstr "�������� ��������"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24476,21 +24716,21 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "������� �����"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "���������"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "��������"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 #, fuzzy
 msgid "Outbox"
 msgstr "mbox"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "������������"
 
@@ -24722,22 +24962,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - ����� �����"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"��� ��������� ����� �� �������� ���\n"
-"������������ ��������."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "������� ����� �����..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "�����..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(��� ���������)"
 
@@ -24759,7 +24992,7 @@ msgstr ""
 "�� ������ ������� \"��������������\" ���� �� �� ������ � Evolution "
 "���������� �������� ���."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "����������, �������, ����� ���������� �� ������ �������������:"
 
@@ -24790,21 +25023,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "������� �����"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "���� \"%s\" �� ����������."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "������ Evolution "
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "�� ������ ������������� ������ ��������� �����"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24813,11 +25042,11 @@ msgstr ""
 "��� ���������, ������� �������� ����������\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "��������������"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24826,17 +25055,17 @@ msgstr ""
 "�������������� %s.\n"
 "������ %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "������ ��� �������� %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "������ ��� �������� %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24845,31 +25074,31 @@ msgstr ""
 "�������������� %s\n"
 "�������������� �������� 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "��������������"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "��� �����:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "������� ����"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "��� �����:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "������ ������ � �������� �� ������ ��������"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "������ ������ �����"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24877,24 +25106,24 @@ msgstr ""
 "���������� ���������...\n"
 "������������ ������������ ��������"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "������ ����������������� �����ԣ��"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "�� %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "������� �����"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "�������� ����� ���������� ��� ������� ���� ������"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "�������������"
 
@@ -24942,9 +25171,14 @@ msgstr "�������� ����� \"%s\""
 msgid "in \"%s\" ..."
 msgstr "������� � %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "�� ������� ������������� �����: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "���������� ������� ��������� �����:\n"
 "%s"
@@ -24962,8 +25196,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "�� ������� ��������� ��������� ��������� ��������� Evolution\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�����"
@@ -25004,58 +25238,59 @@ msgstr "������� � �����..."
 msgid "Select the folder that you want to open"
 msgstr "�������� �����, ������� �� ������ �������"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "������� ����� �����"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "�������� �����, �� ������� ����� ����� ���������:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "������� � ������� �����"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "������� � ���������� �����"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "������� � ����� ������ ��� ����"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(����� �� ��������)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(���)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ������ � ������� ������ ������. ������� �� ��� ������ ��� "
 "�������� � ����� ������ ��� ����."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution � �������� �������� � ����� ������ ��� ����."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ������ � ���������� ������ ������. ������� �� ��� ������ "
 "��� �������� � ����� ������ � ����."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25067,12 +25302,12 @@ msgstr ""
 "������ ������� ���������:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "���������� ���������� ��������� ��������� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25083,31 +25318,31 @@ msgstr ""
 "���������� ����������. ��� ���������� ������������� Evolution ��� ����,\n"
 "����� ����� ����� ������ � ����� ������."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "������������ ���������"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "�� ������� ���������������� � OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "���� ������ �������� �� �������"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "������� ������"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "������� ����� ������ �������"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "�������� ������:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25116,107 +25351,117 @@ msgstr ""
 "�� ������������� ������ ������� ������\n"
 "\"%s\" �� ������ �������?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "�� �������"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "������������� ������ �������"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "������������� ��������� ������ ������� �:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "��������� �����������"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "���������� ������ ��� ��������� �����������"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "������� �����������"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "���������� ������ ��� ������� �����������"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "����� ������..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "������� ����� ������ �������"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "������� ��� ������ �������"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "������������� ��� ������..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "������������� ��� ������ �������"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "������ ������ �������"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "������ ������ �������"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "������� ����� �����"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "������� ����� �����"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "������������� �����"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "������������� ��������� ����� �:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "������� �����, ��������� � ���� �������"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "������� � ����� ����"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "������� �����, ��������� � ���� �������, � ����� ����"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "�������������"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "������������� ���� �����"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "�������"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "������� ���� ����� �� ������ �������"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "������ ���������� �������."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "������"
 
@@ -25224,55 +25469,55 @@ msgstr "������"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "��� ������"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "����� � ����� ��������� ��� ����������"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "��������� ��� ����� �� ��������"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "������ �����/������"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "������������ ����� ��� �������� �����"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "����� �� �����"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "��������� ����� �� �������"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "������� �� ����������� ��� ����� ��������"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "�������� �� ��������������"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "��������� ��� �� �������������� ��� ����� ��������"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "��������� ����� �� ����� ���� �������� ��� �������"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "���������� ������� ����� ��������� ����������� ��������"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "���������� ������� ����� � ����� ���������"
 
@@ -25327,63 +25572,63 @@ msgstr ""
 "������ ������� ���������:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "������ CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "��������"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "������������ ��������"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "��� ����� ���������"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "��� ���������"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "�� �������"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "���������������� ���"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "���������������� �����"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "���������������� ��������"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "���������� ������"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "����������"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "������������ URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "����� ��������� �����"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "��� �����"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "������ �������� �������� ������"
 
@@ -25407,6 +25652,26 @@ msgstr "����"
 msgid "The following connections are currently active:"
 msgstr "� ��������� ������ ������� ��������� ����������:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "���������"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "��������"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "�����"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "������"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "�������� �����:"
@@ -25419,6 +25684,34 @@ msgstr "��� �����:"
 msgid "Specify where to create the folder:"
 msgstr "������� ��� ������� �����:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "������� ����� �����..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "�������� �����:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "�������� �������:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "��� ������������:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "�������� �� ��������� Evolution"
@@ -25517,15 +25810,15 @@ msgstr "�� ���������� �����"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution ����� ������������� ������ �� ��������� ������:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "����� �� Evolution..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25545,53 +25838,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "�� ���������� �����"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "��� ������� � �������� Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "���������� ���������������� �������� Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "��������� ��������"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "������ ��������������"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "������ ����������������� �����ԣ��"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "���������� ���������� ����� ���� ����������� � ����."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "���������� ���������������� ������������ ������� Bonobo."
 
@@ -25627,114 +25920,108 @@ msgstr "����������� ���������"
 msgid "Copy to Folder..."
 msgstr "����������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "������� ����� �������"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "������� ������ ���������"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "�������� ���������"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "������� ��������� ��������"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "����������� ��������� ��������� � ������ �����"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "����������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "�������� ���������"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "���������� �� ��� ��������� �� ������"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "���������� ��� �� ������"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "���������� ��������� ��������"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "��������� ��������� �������� ��� VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "������� �ӣ"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "������� ��� ��������"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "��������� ��������� � ��������� ���������."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "��������� ��������� � ��������"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "��������� ��������� �������� ������� ����"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "����"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "���������� ��������"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "�������� �������� ��������"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "��������"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "������ ���������"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "��������� �������..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "����������� � �����..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "��������� ��� VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "����� ��������"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "������� ���"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "��������� ��������� � ��������..."
 
@@ -25778,11 +26065,6 @@ msgstr "�����"
 msgid "Previews the calendar to be printed"
 msgstr "���������� �� ��� ��������� �� ������"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "���������� ��� �� ������"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "���������� ���� ���������"
@@ -25815,7 +26097,7 @@ msgstr "������"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "�������"
 
@@ -25828,7 +26110,7 @@ msgid "Delete this item"
 msgstr "������� ���� �������"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "������� ������ ������������"
 
@@ -25840,8 +26122,8 @@ msgstr "���������� �� ��� �������� �� ������"
 msgid "Print this item"
 msgstr "���������� ���� �������"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "���������"
 
@@ -25866,9 +26148,9 @@ msgstr "��������� ���� ������� �� �����"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "����"
 
@@ -25878,7 +26160,7 @@ msgstr "���������� �������..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "��������� ���..."
 
@@ -25892,8 +26174,8 @@ msgstr "��������� ��������� � ��������..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "���������"
 
@@ -25990,26 +26272,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "���������� ��� ���������, ���������� ��� ���̣����,  �� ���� ������"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "������� ���������"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "���������� ��������� � �����"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "�������� ���� ��������� ���������"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "����������� ��� ���������� �� �������� �� ����� �� ���̣���� �������"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "��������� ����������� �����..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "��������� �������..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "������ ���������������� ���������"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "����������� �� �����..."
 
@@ -26106,7 +26398,7 @@ msgstr "���������� �������� �� ���� ��������� � ������ ���������"
 msgid "_Expunge"
 msgstr "���������� ���̣����"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "�����"
 
@@ -26353,176 +26645,191 @@ msgid "P_revious Unread Message"
 msgstr "����������� �������������� ���������"
 
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "��������� �����"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "��������� ����� ����� �� ���� ������"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "����������� ������� ���������"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "���������� ��� ��������� �� ������"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "����."
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "���������� ��� ���������"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "��������� ��������� ��������� ����-����"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "���������� ������ ������ � ��������"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "����� � ���������..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "������"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "��������� ��������� � ��������� �����"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "����� � ������ ������������� ���������"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "��������� ��������� �������� ��� ������ �������� ��������"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "���������� ��� ����"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "���������� ��� ���������"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "���������� ��������� � ������� �����"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "���������� ��������� �� ����� �����������"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "���������� ������ �������� ����� ���������"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "������ ������"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "������������ ���������� ���������"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "����������� ����� �� ������ ��������..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "����������� ����� �� �����������..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "����������� ����� �� �����������..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "����������� ����� �� ����..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "������������"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "����������� � �����"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "������� ������ �� ���������"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "��������� ���������"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "������� �"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "����������"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "������"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "����������� ���������"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "����������� � �����"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "���������� ���������"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "���������� �����������"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "������� ���������"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "����������� ���������"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "�������������"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "�������������..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "�����������"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "������������"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "������� ��� ����"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "�������"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "���"
 
@@ -26550,169 +26857,161 @@ msgstr "����������� ��� ��������� � ����� S/MIME ������������ ����������"
 msgid "For_mat"
 msgstr "������"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "�������� ��������� ����..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "�������� ���� ��� ����� � ���������"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "������� ��������� ����..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "�������"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "������� ����"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "����������� � ������� PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "��������� � ������� PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "����������� � ������� S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "��������� � ������� S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "��������� ���"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "��������� ����������"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "��������� � �����..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "��������� ������� ����"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "��������� ������� ���� ��� ������ ������"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "��������� ��������� � ��������� �����"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "���������"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "��������� �����"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "��������� �����"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "��������� ����� � ������� HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "��������� ��������� �����"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "��������� ��� ��������� ������"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "��������/������ ������������ �����"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "�������� ������������ �����"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "�������� ������������ �����"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "��������� ��� ��������� ����� PGP-������"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "��������� ��� ��������� ����� S/MIME ������������ ����������"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "����������� ����������� ���� ������� �����"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "����������� ����������� ���� �����"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "����������� ����������� ������ ��� ���� \"��\""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "����������� ����������� ���� \"�����\""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "������������ ����..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "���� ������� �����"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "���� �����"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "������� ���"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "���� \"��\""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "��������"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "�������..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "���� \"�����\""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "��������� ���� ������� � ������� ���� �������"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "�������"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "�������"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "�������� ����� � ������ ������ ����������� �����"
@@ -26806,170 +27105,201 @@ msgid "Add to _Shortcut Bar"
 msgstr "�������� � ������ �������"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "�������� �������� ���� �����"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "����������� ��� �����"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "������� ����� �����..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "������� ������ �� ��� ����� �� ������ �������"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "������� ����� �����"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "������� ����� �����"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "������� ����� �����"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "������� ��� �����"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "�������� ������ �����"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "�����"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "���� Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "����� �� ���������"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "������������� ������ �� ������ ��������"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "����������� ��� ����� � ������ �����"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "������� ����� �����..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "������� � ����� ����"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "������� ��� ����� � ����� ����"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "��������� Pilot..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "�������� � ���������"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 msgid "Send queued items and retrieve new items"
 msgstr "��������� ����� �� ������� � �������� ����� �����"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "��������� �����"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "�������� ���������� � ��������� Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "��������� ��������� �� ������"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "��������� ��������� �� ������ ��������� Bug Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "�����������"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "����������� ����������� ������ �����"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "����������� ����������� ������ �������"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "����������� ������ �/��� ����."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "�������� ��������� �����"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "���� �� Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "� ��������� Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "������ �����"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "�����"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "������� � �����..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "�����������..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "�������"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "������� �����"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "��������� Pilot..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "��������� �������"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "�������������..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "�������� � ���������"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "�����"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "������ �������"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "�����"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "���������� ������"
@@ -26983,17 +27313,40 @@ msgid "Reload the view"
 msgstr "������������� ���� ���������"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "�������� ��������"
+#, fuzzy
+msgid "By _Company"
+msgstr "�� ��������"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "�� ��������"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "�������� ��������"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "������ ���������"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "��� ������"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "��� ����"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "��� �����"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "��� ������� ������"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27019,13 +27372,19 @@ msgstr "�� ����"
 msgid "Messages"
 msgstr "���������"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "C ����������:"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "������"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27178,11 +27537,11 @@ msgstr "��������� ��������"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "�������� ������"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "��������� ���������� ������"
 
@@ -27222,19 +27581,19 @@ msgstr "���������"
 msgid "Don't show this message again."
 msgstr "�� ���������� ��� ��������� �����."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "�����"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "��������"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "�����"
 
@@ -27248,18 +27607,156 @@ msgstr "������ ������������ �������� ����"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "������������ ����������� ������; ������� ���������"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): �� ������� ���������������� GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): �� ������� ���������������� GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution �� � ��������� �������� � ��������� �������� ������.\n"
+#~ "��� ����� ���� ������� ����� ���������� �������� �����.\n"
+#~ "����� ������ ������� ����� ������ � ������� ������ ��� ��������,\n"
+#~ "����������, ������� ������ ��� Jon Trowbridge <trow@ximian.com>\n"
+#~ "� ��������� ��������� �������, ��� ������� ������ ������\n"
+#~ "���������. �������."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution �� � ��������� �������� � ��������� �������� ������.\n"
+#~ "� ���������� �������� ��� ������� �� ������ ���������.\n"
+#~ "���������� ��������� ������ Evolution � ��������� ��� ������."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "�����������..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "������ ��������� ���������. ��������� �����̣���� ������?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "������� ��� �������"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "������ �����/������: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "������ �� ������ ����������: %s: ������ �����, ��� �� ��������"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "������ ������ HELO: %s: �� ��������"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
+
+#~ msgid "Insert File"
+#~ msgstr "�������� ����"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "�� ������� ������������ ����."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "���� ��������� ����� ������������ ����\n"
+#~ "�� �������� ������� �������, ���� \n"
+#~ "�� �������� �������� ����������� �����."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "�������� �������� Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "�� ������� ��� ������ ������� ��� �ޣ���� ������ ��������?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "�� ������ ��������� �ޣ���� ������ �� ����, ��� ������� ���������� �����."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "������ NNTP"
+
+#~ msgid "News Servers"
+#~ msgstr "������� ��������"
+
+#~ msgid "Source"
+#~ msgstr "��������"
+
+#~ msgid "Source Information"
+#~ msgstr "���������� �� ���������"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "��������� �� �����..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "��������� ��������� ���..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "���������� ������� ��������: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - ����� �����"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "��� ��������� ����� �� �������� ���\n"
+#~ "������������ ��������."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "�� ������ ������������� ������ ��������� �����"
+
+#~ msgid "_Contact List"
+#~ msgstr "������ ���������"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "�������� ��������� ����..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "�������� ���� ��� ����� � ���������"
+
+#~ msgid "Insert text file..."
+#~ msgstr "������� ��������� ����..."
+
+#~ msgid "Send _Later"
+#~ msgstr "��������� �����"
+
+#~ msgid "Send _later"
+#~ msgstr "��������� �����"
+
+#~ msgid "Send the message later"
+#~ msgstr "��������� ��������� �����"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "��������� Pilot..."
+
 #~ msgid "Addressbook Settings"
 #~ msgstr "��������� �������� ����"
 
@@ -27397,9 +27894,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Hulu"
 #~ msgstr "��������"
 
-#~ msgid "Select a signature file"
-#~ msgstr "������� ���� �������"
-
 #, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "������� �ӣ ����� �������"
@@ -27774,12 +28268,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "label26"
 #~ msgstr "�����"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "������� ����� �������"
-
-#~ msgid "Create a new task"
-#~ msgstr "������� ����� ������"
-
 #~ msgid "New _Task"
 #~ msgstr "����� ������"
 
@@ -27859,9 +28347,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ "����������� � ������� POP ����� ������������� � �������������� "
 #~ "�������������� Kerberos 4."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "�� ������� ������������������� �� ������� KPOP: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "�� ������� ������������ � �������: %s"
 
@@ -27930,9 +28415,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "����� ��� �������� ����� (����������)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "���������� ������������ � �������: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "����� �������� ���������"
 
@@ -27978,9 +28460,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "�����������:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "��������� ���� ������"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�� ��������� ���������� ����� � ������� HTML."
 
@@ -28053,9 +28532,6 @@ msgstr "init_bonobo(): �� ������� ���������������� Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "������� ��� ��������� �ޣ���� ������ ����� � ������ ���������"
 
-#~ msgid "New Message"
-#~ msgstr "������� ���������"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "��������� �����..."
 
diff --git a/po/sk.po b/po/sk.po
index dca56b12d0..5b616a7ae0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 27.02.2002 13:56\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -34,7 +34,7 @@ msgstr "Importuje súbory VCard do Evolution."
 msgid "File As"
 msgstr "Uložiť ako"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Meno"
@@ -342,46 +342,46 @@ msgstr "VKartapre %s"
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Hľadám...."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Načítavam..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Chyba v hľadanom výraze."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Pridávam kartu do serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Odstraňujem kartu zo serveru LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Upravujem kartu na serveri LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Spúšťam hľadanie znovu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Prijímam výsledky hľadania LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Nie je možné spracovať URL `%s'"
@@ -472,11 +472,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -492,22 +492,31 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server obsahujúci informácie o kontaktoch"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Vytvoriť nový kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nový zoznam kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Zoznam _kontaktov"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nový kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Vytvoriť nový zoznam kontaktov"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -530,30 +539,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Nie je možné inicializovať gnome-vfs"
 
@@ -561,11 +570,11 @@ msgstr "Nie je možné inicializovať gnome-vfs"
 msgid "Other Contacts"
 msgstr "Iné kontakty"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Nie je možné otvoriť adresár"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -574,7 +583,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:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -585,7 +594,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -593,44 +602,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Zadajte heslo pre %s (používateľ %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "končí na"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "E-mail 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategória je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ktoré zobrazí prehliadač priečinku"
 
@@ -752,7 +761,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Zdroje adresára"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -847,8 +856,8 @@ msgstr "Nastavenie"
 msgid "Mappings"
 msgstr "Okraje"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_každých"
@@ -902,8 +911,8 @@ msgstr "_Rozsah hľadania:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Hľadám"
 
@@ -1100,15 +1109,15 @@ msgid "Using email address"
 msgstr "E-mailová adresa"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Pridať"
 
@@ -1156,12 +1165,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Upraviť"
@@ -1277,10 +1286,10 @@ msgstr "Vytváracie rozhranie pre rozhranie pre výber mena adresára."
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstrániť"
 
@@ -1309,40 +1318,15 @@ msgstr "(%d nezobrazených)"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Vyberte kontakty z adresára"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Odosielateľ obsahuje"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution sa nepodarilo získať lokálny uloženie pre adresár. Je to možno\n"
-"spôsobené pádom komponentu evolution-addressbook. Aby sme lepšie pochopili\n"
-"a vyriešili tento problém, pošlite e-mail Jonovi Trowbridgeovi <trow@ximian\n"
-"com> s detailným popisom okolností, pri ktorých sa chyba objavila. Ďakujeme."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution sa nepodarilo získať uloženie pre lokálny adresár.\n"
-"Obvykle by sa to nemalo stať. Možno budete musieť znovu\n"
-"Evolution spustiť, aby sa problém vyriešil."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Vyberte kontakty z adresára"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Výber mien"
@@ -1364,15 +1348,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Presunúť..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategória:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Priečinok:"
 
@@ -1477,11 +1456,12 @@ msgstr "Chce prijímať poštu ako _HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Odstrániť"
 
@@ -2713,7 +2693,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skryť adresy pri posielaní e-mailu do tohto zoznamu"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Odstrániť"
 
@@ -2776,7 +2756,7 @@ msgstr ""
 "priečinku existuje. Chcete ho aj tak pridať?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
@@ -2803,21 +2783,21 @@ msgid "Error getting book view"
 msgstr "Chyba pri vytváraní pohľadu na adresár"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Úspech"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -2825,8 +2805,8 @@ msgstr "Neznáma chyba"
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
@@ -2843,7 +2823,7 @@ msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2866,46 +2846,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Súbor %s neexistuje"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Iná chyba"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Chcete uložiť zmeny?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Chyba pri pridávaní karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Zobraziť karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Zobraziť karty"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2915,19 +2900,19 @@ msgstr ""
 "Požadujete, aby %d kariet bolo kartami. Otvorí sa %d nový okien.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopírovať karty do"
 
@@ -2999,7 +2984,7 @@ msgstr "Adresár"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Uložiť ako VCard"
 
@@ -3039,7 +3024,7 @@ msgid "Pilot Settings..."
 msgstr "Nastavenie _pilota..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Predať ďalej kontakt"
 
@@ -3048,8 +3033,8 @@ msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Tlačiť"
@@ -3067,7 +3052,7 @@ msgid "Move to folder..."
 msgstr "Presunúť do priečinka..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
 
@@ -3078,20 +3063,20 @@ msgid "Copy"
 msgstr "Kopírovať"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Odstrániť"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktuálny pohľad"
@@ -3256,7 +3241,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Nastavenie"
 
@@ -3346,26 +3331,26 @@ msgstr "Schôdzka bez mena"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normálny"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Nízka"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Nedefinovaná"
@@ -3486,11 +3471,11 @@ msgstr "Čas opakovania (minúty)"
 msgid "_Edit appointment"
 msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3501,13 +3486,13 @@ 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:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varovanie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3524,7 +3509,7 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
@@ -3552,7 +3537,7 @@ msgstr "Popis obsahuje"
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Nenájdené"
 
@@ -3563,7 +3548,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3585,19 +3570,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nie je možné vytvoriť kalendárový pohľad. Prosím, overte nastavenie ORBit a "
 "OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Súkromný"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tajný"
@@ -3622,37 +3607,37 @@ msgstr "V"
 msgid "W"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Voľný"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Nezačal"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Prebieha"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Dokončený"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3663,56 +3648,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Opakovanie"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Priradené"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Áno"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nie"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Deň"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Pracovný týždeň"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Týždeň"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Mesiac"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -3720,12 +3704,12 @@ msgstr "Kalendár"
 msgid "Folder containing appointments and events"
 msgstr "Priečinok obsahujúci schôdzky a udalosti"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -3733,39 +3717,56 @@ msgstr "Úlohy"
 msgid "Folder containing to-do items"
 msgstr "Priečinok obsahujúci úlohy to-do"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nová schôdzka"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "S_chôdzka"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Vytvoriť novú schôdzku"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Vytvorí novú požiadavku na stretnutie"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Vytvorí novú úlohu"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nová schôdzka"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "S_chôdzka"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Vytvoriť novú schôdzku"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3833,7 +3834,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "S týmito argumentami:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dní"
 
@@ -3841,11 +3843,13 @@ msgstr "dní"
 msgid "extra times every"
 msgstr "extra oprakovanie každých"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minút"
 
@@ -3973,7 +3977,7 @@ msgstr "Pripomenutia"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -4002,7 +4006,7 @@ msgstr "koniec schôdzky"
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minút"
 
@@ -4180,7 +4184,7 @@ msgid "_Fri"
 msgstr "P_ia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Všeobecné"
 
@@ -4225,19 +4229,33 @@ msgstr "_Str"
 msgid "before every appointment"
 msgstr "pred začiatkom schôdzky"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Stav stretnutia sa zmenil. Chcete poslať aktualizovanú verziu?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto úlohu?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
 
@@ -4305,61 +4323,61 @@ msgstr " (Termín do "
 msgid "Due "
 msgstr "Termín do "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nepodarilo sa korektne aktualizovať objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
@@ -4558,7 +4576,7 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4570,7 +4588,7 @@ msgstr "Rola"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4655,7 +4673,7 @@ msgstr "zapnutá"
 msgid "first"
 msgstr "zoznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekundy"
 
@@ -4679,7 +4697,7 @@ msgstr "zoznam"
 msgid "Other Date"
 msgstr "Ďalší fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "deň"
 
@@ -4777,20 +4795,26 @@ msgstr "% hotových"
 msgid "Date Completed:"
 msgstr "Dátum dokončenia:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Potrebné úkony"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Priebeh"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Priorita:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stav:"
 
@@ -4804,7 +4828,7 @@ msgstr "Základné"
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4873,80 +4897,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Priradiť úlohu"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
@@ -4955,8 +4979,8 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Alarms"
 msgstr "Alarmy"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Hotovo"
 
@@ -4984,11 +5008,9 @@ msgstr "Priorita"
 msgid "Start Date"
 msgstr "Dátum štartu"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Súhrn"
 
@@ -5030,111 +5052,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "dopoludnia"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "popoludní"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nová _schôdzka"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Tlačiť..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Nastaviť %s"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Nastaviť %s"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Nastaviť tento výskyt ako _presunuteľný"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
@@ -5175,7 +5196,7 @@ msgstr "Úloha dokončená: <b>"
 msgid "Task Due: <b>"
 msgstr "Termín úlohy: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
@@ -5184,335 +5205,340 @@ msgstr "Informácie o iCalendar"
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Miesto: "
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Stav:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> poslal informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpovedal na priradenie úlohy."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publikoval informácie o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Príloha neobsahuje platnú správu kalendára"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba pri sťahovaní dát pre"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Súbor kalendára nie je aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Vybrať priečinok"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Vybrať priečinok"
@@ -5558,7 +5584,7 @@ msgstr "dátum začiatku"
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
@@ -5571,57 +5597,52 @@ msgid "Non-Participants"
 msgstr "Bez účasti"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individuálne"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Skupina"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Zdroj"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Miestnosť"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Predseda"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Potrebné úkony"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Predbežný"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegované"
 
@@ -5711,48 +5732,45 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nepodarilo sa načítať úlohy v `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nie je možné otvoriť priečinok v `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "O_dstrániť túto schôdzku"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5763,11 +5781,16 @@ msgstr "Nie je možné otvoriť priečinok v `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Metóda nutná k otvoreniu `%s' nie je podporovaná"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otváram kalendára na%s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Otváram priečinok %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -5824,53 +5847,58 @@ msgstr "Október"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Nutný je aspoň jeden účastník"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organizátor musí byť nastavený."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "informácie o udalosti"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Informácie o úlohe"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Informácie o denníku"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Informácie o kalendári"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Aktualizovať"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Obnoviť zoznam"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Musíte byť účastníkom stretnutia."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Nie je možné inicializovať Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre komponent editora"
 
@@ -6097,9 +6125,8 @@ msgid "Print Calendar"
 msgstr "Tlačiť kalendár"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -6133,8 +6160,8 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
@@ -6196,17 +6223,29 @@ msgstr "Importuje súbory iCalendar do Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importuje súbory vCalendar do Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Nie je možné sa spojiť so skladom: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Pripomenutie"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Správa kalendára"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6215,84 +6254,84 @@ msgstr ""
 "Evolution našiel poštové súbory Pine.\n"
 "Chcete ich naimportovať do Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Kalendár"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time očakáva 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time očakáva ako prvý argument reťazec"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time očakáva prvý argument reťazec dátumu/času podľa ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day očakáva dva argumenty"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day očakáva ako druhý argument celé číslo"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin očakáva jeden argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end očakáva jeden argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype neočakáva argumenty"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? očakáva dva argumenty"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? očakáva ako druhý argument time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? očakáva dva argumenty"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? očakáva ako prvý argument reťazec"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? očakáva ako druhý argument reťazec"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6300,11 +6339,11 @@ msgstr ""
 "contains? očakáva ako prvý argument jednu z hodnôt \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? očakáva aspoň jeden argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6312,19 +6351,19 @@ msgstr ""
 "has-categories? očakáva ako všetky argumenty reťazce alebo presne jeden "
 "argument boolean nepravu (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? neočakáva žiadne argumenty"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? očakáva jeden argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? očakáva ako prvý argument time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Vyhodnotenie výrazu pre hľadanie neskončilo pravdivostnou hodnotou"
 
@@ -7921,71 +7960,81 @@ msgstr "Ukladám priečinok '%s'"
 msgid "You must be working online to complete this operation"
 msgstr "Pre dokončenie tejto operácie musíte pracovať on-line"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nepodarilo sa prijať správu"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Neplatné argumenty"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Neplatné argumenty"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
@@ -8041,7 +8090,7 @@ msgstr "Presúvam správy"
 msgid "Copying messages"
 msgstr "Kopírujem správy do %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8049,47 +8098,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Nezadané meno súboru."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie je možné zašiftovať správu: adresáti nie sú definovaní"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8097,18 +8146,18 @@ msgid ""
 "%.*s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, 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"
@@ -8134,22 +8183,22 @@ msgid "Could not lock '%s'"
 msgstr "Nepodarilo sa zamknúť '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie je možné vytvoriť súbor so zámkom pre %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Vypršal čas pri pokuse o získanie zámku na %s. Skúste to neskôr."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nepodarilo sa získať zámok pomocou fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodarilo sa získať zámok pomocou flock(2): %s"
@@ -8208,11 +8257,16 @@ msgstr "Chyba pri zápise pošty do dočasného súboru: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Chyba kopírovaní dočasného súboru: pošty %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Nepodarilo sa dešifrovať: Neznáme"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Nepodarilo sa dešifrovať: Neznáme"
@@ -8349,7 +8403,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -8523,33 +8577,134 @@ msgstr "Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
 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-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Nepodarilo sa overiť certifikáty"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Vydal: %s\n"
-"Pre: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Nepodarilo sa overiť certifikáty"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Súbor s podpisom:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID _certifikátu:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Chyba pri načítavaní %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Mimo kancelárie"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
 msgstr ""
-"Neplatný certifikát od %s.\n"
-"\n"
-"%s\n"
-"\n"
-"Chcete ho aj tak akceptovať?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nepodarilo sa overiť certifikáty"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID _certifikátu:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Neplatné argumenty"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID _certifikátu:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID _certifikátu:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8562,16 +8717,33 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "ZLE"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Neplatný certifikát od %s.\n"
+"\n"
+"%s\n"
+"\n"
+"Chcete ho aj tak akceptovať?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8591,32 +8763,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Chyba pri štarte %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, 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:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
@@ -8624,12 +8801,12 @@ msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
@@ -8658,40 +8835,40 @@ msgstr "Odpoveď IMAP serveru neobsahovala informáciu %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Neočakávaná odpoveď OK od IMAP serveru: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 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:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 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:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 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:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Hľadám nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -8700,10 +8877,10 @@ msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nie je možné otvoriť priečinok pre vyrovnávaciu pamäť: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nepodarilo sa uložiť správu %s: %s"
@@ -8716,7 +8893,7 @@ msgstr "Kontrolujem novú poštu"
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Priečinky"
 
@@ -8747,7 +8924,7 @@ msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Heslo"
 
@@ -8756,73 +8933,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s služba pre %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operácia nepodporovaná"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Overenie zlyhalo."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Priečinok je prázdny"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8833,31 +9014,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Meno priečinku nesmie obsahovať znak Enter."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nie je možné otvoriť poštovú schránku: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8879,7 +9066,10 @@ msgid "Local delivery"
 msgstr "Lokálne doručenie"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Pre ukladanie lokálnej pošty v štandardnom formáte mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8907,14 +9097,14 @@ msgstr "Štandardný Unixový súbor mbox"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Pre čítanie a ukladanie lokálnej pošty v priečinkov v štandardnom formáte "
 "Unix mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8925,38 +9115,38 @@ msgstr "Koreň ukladania %s nie je absolútna cesta"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, 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:185
+#: camel/providers/local/camel-local-store.c:186
 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:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, 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"
@@ -9016,7 +9206,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9054,26 +9244,26 @@ msgstr "nie je priečinok maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie je možné prehľadať priečinok `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Nie je možné otvoriť cestu poštovej schránky: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Kontrolujem novú poštu"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Hľadám nové správy"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Ukladám priečinok"
@@ -9117,7 +9307,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9126,7 +9316,7 @@ msgstr ""
 "Nie je možné otvoriť súbor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9135,14 +9325,14 @@ msgstr ""
 "Nie je možné vytvoriť súbor `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' nie je normálny súbor."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9151,7 +9341,7 @@ msgstr ""
 "Nie je možné odstrániť priečinok `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
@@ -9166,64 +9356,64 @@ msgstr "Nie je možné otvoriť priečinok %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, 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:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznáma chyba: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nie je možné premenovať priečinok: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Zápis do dočasnej schránky zlyhal: %s: %s"
@@ -9373,47 +9563,47 @@ msgstr "Použite Zrušiť"
 msgid "Operation failed: %s"
 msgstr "Operácia zlyhala: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Získavam POP súhrn"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Používateľ zrušený"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Nie je možné súhrn POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Odstraňujem zmazané správy"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Žiadna správa s uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Získavam POP správu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Nie je možné získať správu %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
@@ -9430,7 +9620,7 @@ msgstr "Nechať poštu na serveri"
 msgid "Delete after %s day(s)"
 msgstr "Odstrániť po %s dňoch"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9456,6 +9646,11 @@ msgstr ""
 "APOP. Nemusí to fungovať pre všetkých používateľov aj keď server tvrdí, že "
 "tento protokol podporuje."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nie je možné spojenie s %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9467,54 +9662,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Nie je možné sa spojiť s POP serverom na %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Požadovaný spôsob overenia nie je podporovaný."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Prihlásenie zlyhalo: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL chyba protokolu"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "Chyba V/V: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"Nepodarilo sa overiť na IMAP serveri.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsím, zadajte POP heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9538,35 +9738,35 @@ msgstr "Nie je možné vytvoriť rúru do sendmailu: %s: pošta neodoslaná"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nie je možné spustiť sendmail: %s: pošta neodoslaná"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie je možné poslať správu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail skončil so signálom %s: pošta neodoslaná."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie je možné vykonať %s: pošta neodoslaná."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail skončil so stavom %d: pošta neodoslaná."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9675,45 +9875,45 @@ msgstr "Dočasné zlyhanie overenia."
 msgid "Authentication required"
 msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Chyba privítanie od serveru: %s : možno nie kritické"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Chyba odpovede QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Nepodarilo sa pripojiť k POP serveru.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Správa nevyzerá ako platná."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9724,88 +9924,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie je možné poslať správu: adresáti nie sú platní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Vypršal čas odpovede HELO: %s: nie je kritická"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Chyba odpovede HELO: %s: nie je kritická"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Vypršal čas odpovede RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Požiadavka AUTH zlyhala."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede MAIL FROM: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "Chyba odpovede MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Vypršal čas odpovede RCPT TO: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -9813,86 +10013,86 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Chyba odpovede DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: koniec správy: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "Chyba odpovede ukončenia DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Vypršal čas odpovede RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "Chyba odpovede RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Vypršal čas odpovede QUIT: %s: nie je kritická"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Vypršal čas požiadavky AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "Chyba odpovede QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 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:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Nie je možné priložiť súbor %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Nie je možné priložiť súbor %s: nie je to normálny súbor"
@@ -9910,56 +10110,60 @@ msgid "MIME type:"
 msgstr "Typ MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Kliknutím zobrazíte adresár"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Od:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Komu:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Zadajte adresátov správy"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Zadajte adresy, ktoré dostanú kópiu správy"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9967,17 +10171,25 @@ msgstr ""
 "Zadajte adresy, ktoré dostanú kópiu správy bez toho, aby boli v zozname "
 "adresátov správy."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nepodarilo sa vytvoriť kontext podpisu PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9986,34 +10198,34 @@ msgstr ""
 "Chyba pri čítaní súboru %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Varovanie!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Súbor existuje, prepísať ho?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Chyba pri ukladaní súboru: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Chyba pri načítavaní súboru: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Chyba pri prístupe k súboru: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Nie je možné získať správu z editora"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10022,7 +10234,7 @@ msgstr ""
 "Nepodarilo sa hľadať v súbore: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10031,7 +10243,7 @@ msgstr ""
 "Nepodarilo sa skrátiť súbor: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10040,7 +10252,7 @@ msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10048,7 +10260,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10058,43 +10270,39 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Vložiť súbor"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Uložiť podpis"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (štandard)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Napísať správu"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10102,7 +10310,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:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10110,9 +10318,9 @@ msgstr ""
 "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
 "Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10176,8 +10384,8 @@ msgstr "Predmet obsahuje"
 msgid "Subject does not contain"
 msgstr "Predmet neobsahuje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10185,12 +10393,11 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Uložiť toto heslo"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -10288,150 +10495,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "roku"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "rokov"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekúnd"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mesiaca"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minúty"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mesiacov"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "hodiny"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "týždňa"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "týždňov"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "hodiny"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mesiaca"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minúty"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mesiacov"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekúnd"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "roku"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "rokov"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Zabudli ste vybrať dátum."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Vybrali ste neplatný dátum."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Dátum správy bude porovnaný s časom\n"
-"keď bol spustený filter alebo keď bol\n"
-"otvorený vpriečinok."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s časom, ktorý tu uvediete."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s čas relatívnym k okamžiku, keď bol\n"
-"filter spustený. Napr. \"pred týždňom\".."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "aktuálny tento"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "zadaný čas"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "čas relatívny k aktuálnemu času"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Vyberte čas, s ktorým sa má porovnávať"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Porovnať s"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<kliknutím vyberiete dátum>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "teraz"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " naspäť"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "späť"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " naspäť"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<kliknutím vyberiete dátum>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Vyberte čas, s ktorým sa má porovnávať"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Pravidlá filtra"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Zadajte meno súboru:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fronta `%s' neexistuje alebo nie je normálny súbor."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vyberte akciu:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Potom"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Pridať akciu"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10439,12 +10596,12 @@ msgstr ""
 "Zabudli ste vybrať priečinok.\n"
 "Prosím, vráťte sa a zadajte platný priečinok, kam doručiť poštu."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10453,92 +10610,168 @@ msgstr ""
 "Chyba v regulárnom výraze '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Dôležité"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Musíte tento filter pomenovať."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Meno pravidla: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Bez mena"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Ak"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Spustiť akcie"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "ak odpovedajú všetky kritériá"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "ak odpovedá niektoré kritérium"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Pridať kritérium"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "prijatá"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "odoslaná"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Porovnať s"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Upraviť filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Upraviť vpriečinky"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Prijatá"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Odoslaná"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s časom, ktorý tu uvediete."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s čas relatívnym k okamžiku, keď bol\n"
+"filter spustený. Napr. \"pred týždňom\".."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s časom, ktorý tu uvediete."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuálne priečinky"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "čas relatívny k aktuálnemu času"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "späť"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "iba špecifické priečinky"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "aktuálny tento"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "zadaný čas"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Zdroje vpriečinkov"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "pre všetky aktívne vzdialené priečinky"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "pre všetky lokálne priečinky"
 
@@ -10566,42 +10799,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Firma"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "obsahuje"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopírovať do priečinku"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Dátum prijatia"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Dátum odoslania"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Odstránené"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "nekončí na"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "neexistuje"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "neexistuje"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "nevyzerá ako"
@@ -10623,89 +10856,85 @@ msgid "ends with"
 msgstr "končí na"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Vykonať príkaz"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Existuje"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "existuje"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Výraz"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Follow Up"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Dôležité"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "bolo pred"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "je označený"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "je viac než"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "je menej než"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "nie je"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "nie je označený"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Konferencia"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Telo správy"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Hlavička správy"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Presunúť do priečinku"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Vykonať príkaz"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Prehrať zvuk:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Prečítaná"
 
@@ -10721,57 +10950,87 @@ msgstr "Regul. výraz"
 msgid "Replied to"
 msgstr "Odpovedaná"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "je viac než"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "je menej než"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Skóre"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastaviť stav"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Vykonať príkaz"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Veľkosť (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "vyzerá ako"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Zdrojový účet"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Špecifická hlavička"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "začína na"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Predmet"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Nastaviť stav"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravidlá"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Upraviť pravidlo"
 
@@ -10779,11 +11038,11 @@ msgstr "Upraviť pravidlo"
 msgid "Score Rules"
 msgstr "Pravidlá skóre"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Musíte tento vpriečinok pomenovať."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 
@@ -10791,31 +11050,31 @@ msgstr "Musíte zadať aspoň jeden priečinok ako zdrojový."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importujem..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Prosím, čakajte"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importujem %s ako %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadávam %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10876,39 +11135,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Odpadky"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Lokálny poštový súbor %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Prehľadávam priečinok"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Spúšťam import"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Upraviť filtre"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10989,12 +11248,12 @@ msgstr "Vytváracie rozhranie pre komponent Súhrnu pošty Evolution."
 msgid "Font Preferences"
 msgstr "_Neopakovať"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Účty"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11042,7 +11301,7 @@ msgstr "Vlastnosti..."
 msgid "Change this folder's properties"
 msgstr "Zmení vlastnosti tohto priečinku"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11050,59 +11309,79 @@ msgstr ""
 "Niektoré vaše nastavenia pošty vyzerajú ako poškodené. Prosím, skontrolujte, "
 "že je všetko v poriadku."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Nemáte nastavený spôsob prenosu pošty"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Varovanie: Zmenená správa"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Napísať správu"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Nasledujúca správa"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Predchádzajúca správa"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nová správa"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie je možné inicializovať poštový komponent Evolution."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Nie je možné inicializovať konfiguračný komponent pre poštu Evolution."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr ""
 "Nie je možné inicializovať komponent pre infomácie o priečinkoch Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Pripájam sa na server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Nie je možné zaregistrovať sklad u shellu"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Vlastnosti \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
@@ -11152,136 +11431,136 @@ msgstr "celkovo %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok zo správy"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 #, fuzzy
 msgid "Follo_w Up..."
 msgstr "Follow _Up..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Vymazať _značky"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Použiť filtre"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "VPriečinok na konferenciu"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter na konferenciu (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VPriečinok na konferenciu (%s)"
@@ -11345,76 +11624,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Editor diskusných skupín Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Meno po_užívateľa:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Naozaj chcete odstrániť tento účet?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Neodstraňovať"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Naozaj odstrániť účet?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Zakázať"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Povoliť"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Povolené"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Meno úč_tu:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portoriko"
@@ -11424,30 +11694,30 @@ msgstr "Portoriko"
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11459,7 +11729,7 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11471,7 +11741,7 @@ msgstr ""
 "posielať, prijímať alebo písať poštu.\n"
 "Chcete ho nastaviť teraz?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11479,7 +11749,7 @@ msgstr ""
 "Predtým, ako začnete písať správu,\n"
 "musíte nastaviť identitu."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11488,7 +11758,7 @@ msgstr ""
 "musíte nastaviť spôsob prenosu.."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11496,11 +11766,11 @@ msgstr ""
 "Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú "
 "dostávať takto formátovanú poštu:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11508,7 +11778,7 @@ msgstr ""
 "Táto správa nemá predmet.\n"
 "Naozaj ju chcete poslať?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11516,11 +11786,11 @@ msgstr ""
 "Kedže je zoznam kontaktov, ktorý posielate, nastavený tak, aby skryl adresy, "
 "táto správa bude obsahovať iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Táto správa obsahuje iba adresátov Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11530,15 +11800,11 @@ msgstr ""
 "Apparently-To.\n"
 "Poslať aj tak?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Musíte zadať adresátov pre poslanie tejto správy."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Musíte nastaviť účet pred poslaním tejto správy."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11546,28 +11812,28 @@ msgstr ""
 "Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
 "Chcete použiť štandardný priečinok na koncepty?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Presunúť správu do"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopírovať správu do"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Naozaj chcete upraviť všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11575,7 +11841,7 @@ msgstr ""
 "Upravovať môžete iba správy uložené\n"
 "v priečinku Koncepty."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11583,32 +11849,32 @@ msgstr ""
 "Iba správy z priečinku Odoslané je možné\n"
 "znovu poslať."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Žiadna vybraná správa"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Prepísať súbor?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Uložiť správu ako..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Uložiť správy ako..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Prejsť na nasledujúci priečinok s neprečítanými správami?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11616,7 +11882,7 @@ msgstr ""
 "V tomto priečinku už nie sú žiadne nové správy.\n"
 "Chcete prejsť na nasledujúci priečinok?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11628,7 +11894,7 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto správy?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11637,28 +11903,28 @@ msgstr ""
 "Chyba pri načítavaní informácie o filtroch:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Tlač správy zlyhala"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
@@ -11679,7 +11945,7 @@ msgstr "Bez popisu"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Kontakt bez mena"
@@ -11700,19 +11966,20 @@ msgid "Add Signature"
 msgstr "Uložiť podpis"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie\n"
 "nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosím, zadajte informácie o vašom serveri pre prijímanú poštu.\n"
 "Ak neviete, ktorý typ serveru použiť, kontaktujte vášho administrátora\n"
@@ -11723,10 +11990,10 @@ msgid "Please select among the following options"
 msgstr "Prosím, vyberte si z týchto možností"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosím, zadajte informácie o vašom serveri pre odosielanú poštu. Ak "
 "neviete,\n"
@@ -11735,14 +12002,13 @@ msgstr ""
 "pripojenia na Internet."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Už ste skoro na konci nastavenia pošty. Vaše meno, server pre príjem pošty\n"
 "a spôsob odosielania budú použité pre vytvorenie poštového účtu Evolution.\n"
@@ -11750,44 +12016,20 @@ msgstr ""
 "Toto meno bude používané iba pre zobrazenie."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "po"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Účet"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Kontrolujem službu"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
@@ -12049,237 +12291,225 @@ msgstr "Uložiť a zavrieť"
 msgid "Loading Images"
 msgstr "Nahrávať _obrázky"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Hlavička správy"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Zobrazenie _správy"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronézia"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "_Kanály správ"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Nepovinné informácie"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nie je možné otvoriť správu"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odpovedať komu:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Možnosti príjmu"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Povinné informácie"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Štandardné"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Bezpečnosť"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Bezpečné MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Vyberte program PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavenie serveru"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Skratky"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Uložiť podpis"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Uložiť podpis"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Zdroj"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Informácia o zdrojovom kóde"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Zadajte meno súboru:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12289,205 +12519,201 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začneme."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Východ"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Súbor s po_dpisom:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Typ overenia:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Automaticky kontrolovať novú poštu"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pípnuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML podpis:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Štandardné"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Povoliť"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Správy _predané ďalej"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Celé meno:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "v HTML pošte"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identita"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Použiť ho ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako \"Prečítané\" po"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Cesta k spustiteľnému _súboru PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odpovedať všetkým"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Za_bezpečenie"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "Za_bezpečenie"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Zobraziť čas ako"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Súbor s po_dpisom:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (_SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Premenlivo"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_každých"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " farba"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12511,201 +12737,211 @@ msgstr "Nepodarilo sa vytvoriť kontext obálky S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nie je možné vytvoriť dočasný súbor '%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Uložiť na disk..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Uložiť prílohu"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Zobraziť v text (pomocou %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Skryť"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Externý zobrazovač"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Nahrávať _obrázky"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Načítavam obsah správy"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Úlohy _po termíne:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Uložiť odkaz ako"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s príloha"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Neplatná adresa"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Reply-To"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Komu"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Uložiť správu ako..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Táto správa je digitálne podpísaná. Kliknutím na ikonu zámku získate "
 "podrobnosti."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nepodarilo sa vytvoriť kontext overenia PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Táto správa je digitálne podpísaná a podpis je platný."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na lokálny súbor (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdialené dáta (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Nesprávna časť externého tela."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokálne priečinky"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Znovu nastavujem priečinok"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Nie je možné uložiť metainformácie priečinku, asi zistíte,\n"
 "že ho nie je možné ani otvoriť: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Nie je možné uložiť metainformácie priečinku do %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Nie je možné odstrániť metainformácie priečinku %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Mení priečinok \"%s\" na formát \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s nie je možné znovu nastaviť, pretože to nie je lokálny priečinok"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12713,16 +12949,16 @@ msgstr ""
 "Ak nemôžete otvoriť túto poštovú schránku, potom\n"
 "ju budete musieť opraviť ručne."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Nemôžete zmeniž formát nelokálnych priečinkov."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znovu nastaviť /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12731,7 +12967,7 @@ msgstr ""
 "Chyba počas '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12740,7 +12976,7 @@ msgstr ""
 "Chyba pri vykonávaní operácie:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Pracujem"
 
@@ -12748,100 +12984,100 @@ msgstr "Pracujem"
 msgid "Filtering Folder"
 msgstr "Filtrujem priečinok"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Ale správa bola úspešne odoslaná."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Posielam \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Získavam %d správ"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Ukladám %d správ"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12850,7 +13086,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12859,11 +13095,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12872,27 +13108,22 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Vykonávam príkaz shellu: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Nájsť"
 
@@ -12947,32 +13178,41 @@ msgstr "Cesta: %s, Typ: %s"
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Príjem a odoslanie pošty"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Zrušiť všetko"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Obnovujem..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Uložiť toto heslo"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Zapamätať si heslo pre zvyšok tohto sedenia"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
@@ -12999,7 +13239,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Meno:"
 
@@ -13029,7 +13269,7 @@ msgstr "Predaná správa - %s"
 msgid "Forwarded message"
 msgstr "Predaná správa"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Predaná správa"
 
@@ -13043,7 +13283,7 @@ msgstr "Nastavujem vpriečinok: '%s'"
 msgid "Updating vfolders for uri: %s"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13056,94 +13296,97 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VPriečinky"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Bez predmetu)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Správa"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -13176,48 +13419,48 @@ msgstr "Prijaté"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Prejsť dopredu"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Follow Up"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informácia o zdrojovom kóde"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Odpovedať všetkým"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Ukážka"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "Follow Up"
@@ -13242,16 +13485,16 @@ msgstr "Prihlasujem si priečinok \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Odhlasujem sa z priečinku \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Priečinok"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
@@ -17714,11 +17957,13 @@ msgid "Kushiro Airport"
 msgstr "Kuširo letisko"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyjev/Borispyl"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyjev/Žuljani"
 
 #: my-evolution/Locations.h:1149
@@ -23134,8 +23379,8 @@ msgstr "Bez popisu"
 msgid "Mail summary"
 msgstr "Súhrn pošty"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
@@ -23153,15 +23398,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Slovo dňa"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Citát dňa"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Pridať nový kanál správ"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Zadajte URL nového kanálu správ, ktorý chcete pridať"
 
@@ -23173,27 +23418,27 @@ msgstr "Chyba načítavania RDF"
 msgid "News Feed"
 msgstr "Kanály správ"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "_Pridať"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shannon"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Žiadne úlohy"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(žiadny popis)"
 
@@ -24465,7 +24710,8 @@ msgid "Tasks "
 msgstr "Úlohy "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Nastavenie počasia"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24522,7 +24768,7 @@ msgstr "Zobraziť detaily"
 msgid "Cancel Operation"
 msgstr "Zrušiť operáciu"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24536,20 +24782,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Ako priečinok odoslaných"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Odoslaná pošta"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Odoslané"
 
@@ -24787,22 +25033,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Vytvoriť nový priečinok"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Typ vybraného priečinku nie je platný\n"
-"pre požadovanú operáciu."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Vytvoriť _nový priečinok..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nová..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Bez mena)"
 
@@ -24824,7 +25063,7 @@ msgstr ""
 "Použijte \"Automaticky\" ak typ nepoznáte a Evolution sa\n"
 "ho pokúsi určiť."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Prosím, vyberte informácie, ktoré chcete importovať:"
 
@@ -24855,21 +25094,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Do lokálnych priečinkov môžete iba importovať"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24879,11 +25114,11 @@ msgstr ""
 "%s\n"
 "nie je k dispozícii importér."
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importujem"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24892,17 +25127,17 @@ msgstr ""
 "Importujem %s\n"
 "Začínam %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Chyba pri štarte %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Chyba pri načítavaní %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24911,31 +25146,31 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importovať jeden súbor"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24943,24 +25178,24 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Import"
 
@@ -25008,9 +25243,14 @@ msgstr "Otváram priečinok %s"
 msgid "in \"%s\" ..."
 msgstr "Otvoriť v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nie je možné premenovať priečinok: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Zadaný priečinok sa nedá vytvoriť:\n"
 "%s"
@@ -25028,8 +25268,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nie je možné spustiť rozhranie Evolution Poštový asistent\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nová"
@@ -25070,58 +25310,59 @@ msgstr "Prejsť na priečinku..."
 msgid "Select the folder that you want to open"
 msgstr "Vyberte priečinok, ktorý chcete otvoriť"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Vytvorí novú skratku"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Vyberte priečinok, kam má skratka smerovať:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nezobrazený žiadny priečinok)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Žiadna)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do "
 "módu off-line."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution prechádza do módu off-line."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
 "do módu on-line."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25133,12 +25374,12 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nepodarilo sa vytvoriť lokálny sklad -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25149,31 +25390,31 @@ msgstr ""
 "neočakávane skončil. Musíte ukončiť Evolution a znovu ju\n"
 "spustiť, aby ste získali prístup k vašim dátam."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Meno skupiny:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25182,107 +25423,117 @@ msgstr ""
 "Naozaj chcete odstrániť skupinu\n"
 "`%s' z panelu skratiek?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Neodstraňovať"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Premenovať skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Premenovať túto skupinu skratiek na:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Malé ikony"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Zobraziť skratky ako malé ikony"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Veľké ikony"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Zobraziť skratky ako veľké ikony"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nová skupina..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Odst_rániť túto skupinu..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Odstrániť túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Premenovať túto skupinu..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Premenuje túto skupinu skratiek"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Skryť panel skratiek"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Vytvorí novú skratku"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Vytvorí novú skratku"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Premenovať skratku"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Premenovať túto skratku na:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Otvoriť priečinok skratky v novom okn"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Otvoriť v _novom okne"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Premenuje túto skratku"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "O_dstrániť"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrániť túto skratku z panelu skratiek"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Chyba pri ukladaní skratiek."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Skratky"
 
@@ -25291,55 +25542,55 @@ msgstr "Skratky"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Žiadna chyba"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Priečinok s týmto menom už existuje"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Uvedený typ priečinku nie je platný"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Chyba V/V"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Nedostatok miesta pre vytvorenie priečinku"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Priečinok je prázdny"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Uvedený priečinok nebol nájdený"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funkcia nie je v tomto sklade implementovaná"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operácia nepodporovaná"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Uvedený typ nie je podporovaný týmto skladom"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Uvedený priečinok nie je možné zmeniť alebo odstrániť"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
 
@@ -25394,63 +25645,63 @@ msgstr ""
 "Chyba z aktivačného systému:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Chyba CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Prerušené"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Neplatné argumenty"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Už je vlastník"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Žiadny vlastník"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Nenájdený"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nepodporovaný typ"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nepodporovaná schéma"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nepodporovaná operácia"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existuje"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Neplatné URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Má podpriečinky"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Žiadne voľné miesto"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Starý vlastník skončil"
 
@@ -25474,6 +25725,26 @@ msgstr "Hostiteľ"
 msgid "The following connections are currently active:"
 msgstr "Tieto spojenia sú momentálne aktívne:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalendár"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakty: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pošta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Úlohy"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Meno priečinku:"
@@ -25486,6 +25757,34 @@ msgstr "Typ priečinku:"
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Vytvoriť _nový priečinok..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Meno priečinku:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Meno serveru:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Meno po_užívateľa:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Asistent pre nastavenie"
@@ -25582,15 +25881,15 @@ msgstr "Túto správu už nezobrazovať"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution končí..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25610,44 +25909,44 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Nie je možné inicializovať shell Ximian Evolution."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Zakázať úvodné okno"
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25656,7 +25955,7 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Použite %s --help pre zobrazenie dalších informácií.\n"
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie je možné inicializovať komponentový systém Bonobo."
 
@@ -25691,113 +25990,107 @@ msgstr "Skopíruje výber"
 msgid "Copy to Folder..."
 msgstr "Kopírovať do priečinku..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Vytvoriť nový kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Vytvoriť nový zoznam kontaktov"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Vystrihne výber"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Odstrániť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Presunúť vybrané kontakty do iného priečinku..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Presunúť do priečinka..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Vloží obsah schránky"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Náhľad kontaktov pred tlačou"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "U_kážka pred tlačou"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Uloží vybrané kontakty ako vKartu."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Vybrať všetky kontakty"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Pošle správu vybraným kontaktom."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Poslať správu kontaktu"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Pošle vybrané kontakty inej osobe."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Zastaviť načítavanie"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Zobraziť aktuálny kontakt"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "A_kcie"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Zoznam _kontaktov"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Poslať kontakt ďalej..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Uložiť ako vKartu"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Hľadať kontakty"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Vybrať _všetko"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "_Poslať správu kontaktu..."
 
@@ -25841,11 +26134,6 @@ msgstr "Mesiac"
 msgid "Previews the calendar to be printed"
 msgstr "Ukážka kalendára pred tlačou"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "U_kážka pred tlačou"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Vytlačí tento kalendár"
@@ -25878,7 +26166,7 @@ msgstr "Týždeň"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zavrieť"
 
@@ -25891,7 +26179,7 @@ msgid "Delete this item"
 msgstr "Odstráni túto položku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
@@ -25903,8 +26191,8 @@ msgstr "Náhľad položky pred tlačou"
 msgid "Print this item"
 msgstr "Tlačiť túto položku"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Uložiť"
 
@@ -25929,9 +26217,9 @@ msgstr "Uložiť túto položku na disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Súbor"
 
@@ -25941,7 +26229,7 @@ msgstr "Tlačiť _obálku..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Uložiť _ako..."
 
@@ -25955,8 +26243,8 @@ msgstr "Poslať _správu kontaktu..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Uložiť"
 
@@ -26053,26 +26341,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Napísať _novú správu"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Ukladám správu do priečinku"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Zobraziť okno s náhľadom správy"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prihlásiť alebo odhlásiť priečinky na vzdialených serveroch"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Editor virtuálneho priečinku..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtre..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "_Náhľad"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Prihlásiť priečinky..."
 
@@ -26169,7 +26467,7 @@ msgstr "Zoznam vlákien"
 msgid "_Expunge"
 msgstr "_Vyčistiť"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Priečinok"
 
@@ -26423,177 +26721,192 @@ msgstr "Prejde na predchádzajúcu neprečítanú správu"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Odpoveď pre úlohu"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Prejde na predchádzajúcu dôležitú správu"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Náhľad správy pred tlačou"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Vytlačí túto správu"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "_Presmerovať"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Presmeruje (bounce) vybranú správu niekomu inému"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Vráti text na jeho pôvodnú veľkosť"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Nájsť správu..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Menšie"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Uložiť správu do textového súboru"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Hľadá v texte zobrazenej správy"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Nastaví stránku pre aktuálnu tlačiareň"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Zobraziť zdrojový _kód správy"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Zobraziť ú_plné hlavičky"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Zobraziť správu normálne"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Zobraziť správu so všetkými hlavičkami"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Zobraziť zdrojový poštový formát v správe"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Veľkosť textu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Obnoviť vybrané správy"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "VPriečinok na _konferenciu..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Vpriečinok na _odosielateľa..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Vpriečinok na _adresátov..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Vpriečinok na _predmet..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Priložené"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Správy _predané ďalej"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Prejsť na"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_V texte"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Väčšie"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Zobrazenie _správy"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Nasledujúca správa"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normálne zobrazenie"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Otvoriť správu"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Predchádzajúca správa"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Premenovať..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Zavrieť"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Pohľad"
 
@@ -26621,169 +26934,161 @@ msgstr "Zašifrovať túto správu vaším šifrovacím certifikátom S/MIME"
 msgid "For_mat"
 msgstr "_Formát"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "_HTML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Vložiť te_xtový súbor...."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Vložiť súbor ako text do správy"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Vložiť textový súbor...."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Otvoriť"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "OtvorĂ­ súbor"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Šifrovanie PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Podpis PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Šifrovanie S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Podpis S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Uložiť ako"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Uložiť _koncept"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Uložiť v priečinku..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Uložiť aktuálny súbor"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Uloží aktuálny súbor pod iným menom"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Uložiť správu do daného priečinku"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Poslať"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Poslať _neskôr"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Poslať _neskôr"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Poslať správu vo formáte HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Poslať správu neskôr"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Poslať túto správu hneď"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Zobraziť / Skryť prílohy"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Zobraziť _prílohy"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Zobraziť prílohy"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Podpísať túto správu kľúčom PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpísať túto správu podpisovým certifikátor S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Prepne, či má byť zobrazené pole CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Prepne, či má byť zobrazené pole pre výber odosielateľa"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Prepne, či má byť zobrazené pole Reply-to"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Príloha..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Pole _BCC"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Pole _CC"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Odstrániť všetky"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Pole _Od"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Vložiť"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Pole _Reply-To"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "_HTML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Uložiť zoznam a zatvoriť dialóg"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Pomocník"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Uložiť podpis"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Pridať priečinok do zoznamu prihlásených priečinkov"
@@ -26879,172 +27184,203 @@ msgid "Add to _Shortcut Bar"
 msgstr "Pridať do _panelu skratiek"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Zmeniť meno tohto priečinku"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopírovať tento priečinok"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Vytvoriť _nový priečinok..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Vytvoriť odkaz do tohto priečinku v paneli skratiek"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Vytvorí novú skratku"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Vytvoriť nový priečinok"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Odstrániť tento priečinok"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Zobraziť iný priečinok"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Koniec"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Okno Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importovať dáta z iných programov"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Presunúť tento priečinok inam"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Vytvoriť _nový priečinok..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Otvoriť v novom okne"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Otvoriť tento priečinok v inom okne"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Nastavenie _pilota..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Nastavenie pošty"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Prepnúť"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Prepne, či sa má zobrazovať panel skratiek"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Zobraziť vybraný priečinok"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "O Ximian _Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Pru_h priečinkov"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Priečinok"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Prejsť do priečinku..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Presunúť..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Nový _priečinok"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Nastavenie _pilota..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_Neopakovať"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Premenovať..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Skratka"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Panel skratiek"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Skratka"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Tlačiť súhrn"
@@ -27058,17 +27394,40 @@ msgid "Reload the view"
 msgstr "Znovu načíta pohľad"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Karty adresára"
+#, fuzzy
+msgid "By _Company"
+msgstr "Podľa firmy"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Podľa firmy"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Karty adresára"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Zoznam telefónov"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Týždeň"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Deň"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Mesiac"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Pracovný týždeň"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Ako priečinok odoslaných"
@@ -27093,13 +27452,19 @@ msgstr "Podľa predmetu"
 msgid "Messages"
 msgstr "Správy"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "S kategóriou"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "Ú_loha"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27251,11 +27616,11 @@ msgstr "Znaková sada"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Editor hľadania"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Uložiť hľadanie"
 
@@ -27295,21 +27660,21 @@ msgstr "Správa"
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Nájsť"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Vymazať"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Nájsť"
 
@@ -27323,18 +27688,171 @@ msgstr "Osobný adresárový server"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Vytváracie rozhranie kalendára pre Osobný kalendárový server."
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): Nie je možné inicializovať GNOME"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): Nie je možné inicializovať GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution sa nepodarilo získať lokálny uloženie pre adresár. Je to možno\n"
+#~ "spôsobené pádom komponentu evolution-addressbook. Aby sme lepšie "
+#~ "pochopili\n"
+#~ "a vyriešili tento problém, pošlite e-mail Jonovi Trowbridgeovi "
+#~ "<trow@ximian\n"
+#~ "com> s detailným popisom okolností, pri ktorých sa chyba objavila. "
+#~ "Ďakujeme."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution sa nepodarilo získať uloženie pre lokálny adresár.\n"
+#~ "Obvykle by sa to nemalo stať. Možno budete musieť znovu\n"
+#~ "Evolution spustiť, aby sa problém vyriešil."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Presunúť..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Stav stretnutia sa zmenil. Chcete poslať aktualizovanú verziu?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "O_dstrániť túto schôdzku"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Vydal: %s\n"
+#~ "Pre: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL chyba protokolu"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "Chyba V/V: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Chyba privítanie od serveru: %s : možno nie kritické"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Vypršal čas odpovede HELO: %s: nie je kritická"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Chyba odpovede HELO: %s: nie je kritická"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Vypršal čas odpovede QUIT: %s: nie je kritická"
+
+#~ msgid "Insert File"
+#~ msgstr "Vložiť súbor"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Vybrali ste neplatný dátum."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Dátum správy bude porovnaný s časom\n"
+#~ "keď bol spustený filter alebo keď bol\n"
+#~ "otvorený vpriečinok."
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Firma"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Editor diskusných skupín Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Naozaj chcete odstrániť tento účet diskusných skupín?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Musíte nastaviť účet pred poslaním tejto správy."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "_Kanály správ"
+
+#~ msgid "Source"
+#~ msgstr "Zdroj"
+
+#~ msgid "Source Information"
+#~ msgstr "Informácia o zdrojovom kóde"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Uložiť na disk..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Uložiť správu ako..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Vykonávam príkaz shellu: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Vytvoriť nový priečinok"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Typ vybraného priečinku nie je platný\n"
+#~ "pre požadovanú operáciu."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Do lokálnych priečinkov môžete iba importovať"
+
+#~ msgid "_Contact List"
+#~ msgstr "Zoznam _kontaktov"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Vložiť te_xtový súbor...."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Vložiť súbor ako text do správy"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Vložiť textový súbor...."
+
+#~ msgid "Send _Later"
+#~ msgstr "Poslať _neskôr"
+
+#~ msgid "Send _later"
+#~ msgstr "Poslať _neskôr"
+
+#~ msgid "Send the message later"
+#~ msgstr "Poslať správu neskôr"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Nastavenie _pilota..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Zdroje adresára"
@@ -27492,10 +28010,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Súbor s podpisom:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Odstrániť všetko okrem podpisu"
 
@@ -27807,9 +28321,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Priečinok pre ukladanie pošty (interné)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Nie je možné sa spojiť so skladom: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "Vytvoriť vPriečinok z výsledku hľadania"
 
@@ -27855,9 +28366,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizácia:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Uložiť toto heslo"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Posielať štandardne ako _HTML."
 
@@ -27912,15 +28420,6 @@ msgstr "init_bonobo(): Nie je možné inicializovať Bonobo"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Vytvoriť _nové stretnutie"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Vytvoriť novú schôdzku"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Vytvorí novú požiadavku na stretnutie"
-
-#~ msgid "Create a new task"
-#~ msgstr "Vytvorí novú úlohu"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Vytvorí udalosť počas celého dňa"
 
diff --git a/po/sl.po b/po/sl.po
index a595a01484..2d98e8586c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Uvozi datoteke vVizitk v Evolucijo. "
 msgid "File As"
 msgstr "Zavedi kot"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ime"
@@ -342,45 +342,45 @@ msgstr "VVizitka za %s"
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Iščem..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Nalagam..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Napaka v iskalnem izrazu."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Dodajam vizitko v strežnik LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Odstranjujem vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Spreminjam vizitko iz strežnika LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Znova začenjam iskanje."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Nisem mogel razčleniti niza poizvedbe"
 
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -493,22 +493,31 @@ msgstr "Strežnik LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Strežnik LDAP, ki vsebuje podatke o stikih"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Nov stik"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Stik"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Ustvari nov stik"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Seznam _stikov"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Nov stik"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Stik"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Ustvari nov seznam stikov"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -532,29 +541,29 @@ msgstr "Nisem mogel razčleniti niza poizvedbe"
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL v to zgradbi Evolucije ni vgrajen)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Nisem mogel inicializirati gnome-vfs"
 
@@ -562,11 +571,11 @@ msgstr "Nisem mogel inicializirati gnome-vfs"
 msgid "Other Contacts"
 msgstr "Drugo stiki"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -575,7 +584,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:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -587,7 +596,7 @@ msgstr ""
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -595,42 +604,42 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-naslov je"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Napredno..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prikaže brskalnik map"
 
@@ -753,7 +762,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Viri adresarja"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Vedno"
@@ -851,8 +860,8 @@ msgstr "Nastavitev"
 msgid "Mappings"
 msgstr "Robovi"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 msgid "Never"
 msgstr "Nikoli"
 
@@ -906,8 +915,8 @@ msgstr "_Doseg iskanja:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Iskanje"
 
@@ -1106,15 +1115,15 @@ msgid "Using email address"
 msgstr "E-poštni naslov"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -1162,12 +1171,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Uredi"
@@ -1283,10 +1292,10 @@ msgstr "Tovarna Evolucijinih vmesnikov za izbiro imen iz adresarja"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Odstrani"
 
@@ -1315,43 +1324,15 @@ msgstr "(%d ni pokazanih)"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Izberi stike iz adresarja"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Poišči stik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
-"To se lahko zgodi, če se komponenta evolution-addressbook sesuje.\n"
-"Da bi nam pomagali bolje razumeti in na koncu rešiti ta problem,\n"
-"prosim pošljite e-pošto na Jon Trowbridge <trow@ximian.com>.\n"
-"Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
-"Hvala."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolucija ne more dobiti krajevne hrambe adresarja.\n"
-"V normalnih okoliščinah se to nikoli ne bi smelo zgoditi.\n"
-"Za rešitev tega problema boste morali zapustiti in znova\n"
-"pognati Evolucijo."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Izberi stike iz adresarja"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Izberi imena"
@@ -1373,15 +1354,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Prestavi..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategorija:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Mapa:"
 
@@ -1486,11 +1462,12 @@ msgstr "Želi dobivati _HTML e-pošto"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Zbriši"
 
@@ -2724,7 +2701,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skrij naslove ob pošiljanju pošte na ta seznam"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -2787,7 +2764,7 @@ msgstr ""
 "obstaja v tej mapi. Ga želite vseeno dodati?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
@@ -2814,21 +2791,21 @@ msgid "Error getting book view"
 msgstr "Napaka ob dobivanju pogleda knjige"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Uspeh"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -2836,8 +2813,8 @@ msgstr "Neznana napaka"
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
@@ -2854,7 +2831,7 @@ msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2877,46 +2854,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Želite shraniti spremembe"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Prikaži vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Prikaži vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2926,19 +2908,19 @@ msgstr ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopiraj vizitke v"
 
@@ -3010,7 +2992,7 @@ msgstr "Adresar"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -3050,7 +3032,7 @@ msgid "Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
@@ -3059,8 +3041,8 @@ msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Natisni"
@@ -3078,7 +3060,7 @@ msgid "Move to folder..."
 msgstr "Prestavi v mapo..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
@@ -3089,20 +3071,20 @@ msgid "Copy"
 msgstr "Kopiraj"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Zbriši"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
@@ -3267,7 +3249,7 @@ msgstr "Robovi"
 msgid "Number of columns:"
 msgstr "Število stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Možnosti"
 
@@ -3357,26 +3339,26 @@ msgstr "Neimenovan sestanek"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "visoka"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "običajna"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "nizka"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "ni definirana"
@@ -3496,11 +3478,11 @@ msgstr "Čas podaljška spanja (minut)"
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3512,13 +3494,13 @@ msgstr ""
 "bilo nastavljeno, da pošlje e-pošto. Evolucija bo\n"
 "prikazala običajen opozorilni dialog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3535,7 +3517,7 @@ msgstr ""
 "\n"
 "Ste prepričani, da želite pognati ta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
@@ -3563,7 +3545,7 @@ msgstr "Opis vsebuje"
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
@@ -3574,7 +3556,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3596,19 +3578,19 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Nisem mogel ustvariti pogleda koledarja. Prosim preverite nastavitve ORBit-a "
 "in OAF-a."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "osebno"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "zaupno"
@@ -3633,37 +3615,37 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Prost"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Zaseden"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "ni pričeto"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "v teku"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "končano"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3674,56 +3656,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Ponovi se"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Določena"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Da"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ne"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dnevni pogled"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Pogled delavnega tedna"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Tedenski pogled"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Mesečni pogled"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -3731,12 +3712,12 @@ msgstr "Koledar"
 msgid "Folder containing appointments and events"
 msgstr "Mapa, ki vsebuje sestanke in dogodke"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Naloge"
 
@@ -3744,39 +3725,56 @@ msgstr "Naloge"
 msgid "Folder containing to-do items"
 msgstr "Mapa, ki vsebuje predmete za opravit"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nov sestanek"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Sestanek"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Ustvari nov sestanek"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Ustvari nov zahtevek za sestanek"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Ustvari nov posel"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nov sestanek"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Sestanek"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Ustvari nov sestanek"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3844,7 +3842,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dni"
 
@@ -3852,11 +3851,13 @@ msgstr "dni"
 msgid "extra times every"
 msgstr "dodatnih ponovitev vsakih"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut"
 
@@ -3984,7 +3985,7 @@ msgstr "Opomnilniki"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -4013,7 +4014,7 @@ msgstr "konec sestanka"
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4192,7 +4193,7 @@ msgid "_Fri"
 msgstr "_pet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Splošno"
 
@@ -4237,19 +4238,33 @@ msgstr "_sre"
 msgid "before every appointment"
 msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
 
@@ -4317,61 +4332,61 @@ msgstr " (Rok "
 msgid "Due "
 msgstr "Rok"
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
@@ -4570,7 +4585,7 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4582,7 +4597,7 @@ msgstr "Vloga"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
@@ -4666,7 +4681,7 @@ msgstr "na"
 msgid "first"
 msgstr "prvi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekunda"
 
@@ -4690,7 +4705,7 @@ msgstr "seznam"
 msgid "Other Date"
 msgstr "Drugi faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dan"
 
@@ -4789,20 +4804,26 @@ msgstr "% končano"
 msgid "Date Completed:"
 msgstr "Končano dne:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Potrebuje dejanje"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Napredek"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioriteta:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Stanje:"
 
@@ -4816,7 +4837,7 @@ msgstr "Osnove"
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4885,80 +4906,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreži"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Dodeli nalogo"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -4967,8 +4988,8 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Alarms"
 msgstr "Alarmi"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Končano"
 
@@ -4996,11 +5017,9 @@ msgstr "Prioriteta"
 msgid "Start Date"
 msgstr "Datum pričetka"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Povzetek"
 
@@ -5042,111 +5061,110 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pop"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nov _sestanek"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Natisni..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Nastavi mapo..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Nastavi mapo..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _prestavljivo"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Napaka ob izvajanju %s."
@@ -5187,7 +5205,7 @@ msgstr "Opravilo končano: <b>"
 msgid "Task Due: <b>"
 msgstr "Rok opravila: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
@@ -5196,12 +5214,12 @@ msgstr "Podatki o iKoledarju"
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5209,321 +5227,326 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Lega:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Stanje:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "neznano"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Izberi mapo"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Izberi mapo"
@@ -5569,7 +5592,7 @@ msgstr "začetni-datum"
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Potrebni udeleženci"
 
@@ -5582,57 +5605,52 @@ msgid "Non-Participants"
 msgstr "Ne-udeleženci"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Individualno"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Skupina"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Vir"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Soba"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Stol"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Možni sodelujoči"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Ne-sodelujoči"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Potrebuje dejanje"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Poskusno"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -5722,48 +5740,45 @@ msgstr "Čas pričetka sestanka:"
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Nisem mogel naložiti nalog v `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Nisem mogel odpreti imenika v `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Zbriši ta sestanek"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5774,11 +5789,16 @@ msgstr "Nisem mogel odpreti imenika v `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Odpiram koledar v %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Odpiram mapo %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -5835,51 +5855,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Potreben je vsaj en udeleženec"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Organizator mora biti naveden."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Podatki o dogodku"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Podatki o dnevniku"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Podatki o zasedenosti"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Podatki o kodledarju"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Posodobljen"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Osveži"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Proti-predlog"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Nisem mogel inicializirati Bonoba"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Nisem mogel ustvariti tovarne komponent urejevalnikov"
 
@@ -6106,9 +6131,8 @@ msgid "Print Calendar"
 msgstr "Natisni koledar"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -6143,8 +6167,8 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
@@ -6206,17 +6230,29 @@ msgstr "Uvozi datoteke iCalendar v Evolucijo."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Uvozi datoteke vCalendar v Evolucijo."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Nisem se mogel povezati s hrambo: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Opomnilnik"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Sporočilo koledarja"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6225,83 +6261,83 @@ msgstr ""
 "Evolucija je našla poštne datoteke programa Pine.\n"
 "Jih želite uvoziti v Evolucijo?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "Gnome Koledar"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time pričakuje 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "1. argument make-time mora biti niz ISO 8601 datuma/časa"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day pričakuje, da je 2. argument celo število (integer)"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin pričakuje 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end pričakuje 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? pričakuje, da je 2. argument time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? pričakuje 2 argumenta"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? pričakuje, da je 1. argument niz"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? pričakuje, da je 2. argument niz"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6309,11 +6345,11 @@ msgstr ""
 "contains? pričakuje, da je 1. argument eden od \"any\" (karkoli), \"summary"
 "\" (povzetek), \"description\"(opis)"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? pričakuje vsaj 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6321,19 +6357,19 @@ msgstr ""
 "has-categories? pričakuje, da so vsi argumenti nizi ali da je natanko en "
 "argument boolean neresničen (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? ne pričakuje argumentov"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? pričakuje 1 argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? pričakuje, da je 1. argument time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 "Izračun iskalnega izraza ni podal vrednosti resnično/neresnično (boolean)"
@@ -7931,71 +7967,81 @@ msgstr "Odstranjujem mapo %s"
 msgid "You must be working online to complete this operation"
 msgstr "Za dokončanje te operacije morate delati z mrežo"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Neveljavni argumenti"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Neveljavni argumenti"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
@@ -8051,7 +8097,7 @@ msgstr "Prestavljam sporočila"
 msgid "Copying messages"
 msgstr "Kopiram sporočila v %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8059,47 +8105,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Ime datoteke ni navedeno."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, 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:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8107,18 +8153,18 @@ msgid ""
 "%.*s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8146,24 +8192,24 @@ msgid "Could not lock '%s'"
 msgstr "Nisem se mogel zakleniti '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti ključavnične datoteke za %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "Ob pridobivanju ključavnice na %s je pretekla časovna omejitev. Poskusite "
 "znova kasneje."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
@@ -8222,11 +8268,16 @@ msgstr "Napaka ob pisanju v začasno poštno datoteko: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Napaka ob kopiranju začasne poštne datoteke: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Nisem uspel dešifirati: vzrok neznan"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Nisem uspel dešifirati: vzrok neznan"
@@ -8363,7 +8414,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -8537,33 +8588,134 @@ msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Proizvedel: %s\n"
-"Zadeva: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Nisem mogel shraniti datoteke s podpisom."
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Napaka ob nalaganju %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Iz pisarne"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
 msgstr ""
-"Slab certifikat od %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Ga želite vseeno sprejeti?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Neveljaven argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "ID _certifikata:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8576,16 +8728,33 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "SLABO"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Slab certifikat od %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Ga želite vseeno sprejeti?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8605,32 +8774,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Napaka ob zagonu %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
@@ -8638,12 +8812,12 @@ msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
@@ -8672,40 +8846,40 @@ msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nepričakovan odgovor OK strežnika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -8714,10 +8888,10 @@ msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 msgid "Could not open cache directory: %s"
 msgstr "Nisem mogel odpreti predpomnilniškega imenika: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
@@ -8730,7 +8904,7 @@ msgstr "Preverjam za novo pošto"
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mape"
 
@@ -8760,7 +8934,7 @@ msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Geslo"
 
@@ -8768,69 +8942,73 @@ msgstr "Geslo"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Razširitev SSL/TLS ni podprta"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mapa ni prazna"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8841,31 +9019,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8887,7 +9071,10 @@ msgid "Local delivery"
 msgstr "Krajevna dostava"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Za pobiranje krajevne pošte iz datotek vrste mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8915,13 +9102,13 @@ msgstr "Običajni Unix poštni predali mbox"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8932,38 +9119,38 @@ msgstr "Korenski imenik shrambe %s ni absolutna pot"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
@@ -9023,7 +9210,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9061,26 +9248,26 @@ msgstr "ni imenik vrste maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ne morem odpreti poštnega imenika maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Preverjam za novo pošto"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Pregledujem za novimi sporočili"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Shranjujem mapo"
@@ -9124,7 +9311,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9133,7 +9320,7 @@ msgstr ""
 "Ne morem odpreti datoteke '%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9142,14 +9329,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni običajna datoteka."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9158,7 +9345,7 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
@@ -9173,64 +9360,64 @@ msgstr "Nisem mogel odpreti imenika %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ne morem preveriti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Nisem mogel odpreti datoteke: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti začasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Pisanje v začasni poštni predal ni uspelo: %s: %s"
@@ -9379,47 +9566,47 @@ msgstr "Uporabite preklic"
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Prenašam povzetek POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Uporabnik je preklical"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ne morem dobiti povzetka POP: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Uničujem zbrisana sporočila"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporočila z uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Ne morem dobiti sporočila %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -9436,7 +9623,7 @@ msgstr "Pusti sporočila na strežniku"
 msgid "Delete after %s day(s)"
 msgstr "Zbriši po %s dneh"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9462,6 +9649,11 @@ msgstr ""
 "preko protokola APOP. To ni nujno, da bo delovalo za vse uporabnike in celo "
 "za strežnike, ki trdijo, da jo podpirajo."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9470,55 +9662,57 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
-#, c-format
-msgid "Could not connect to POP server on %s"
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Prijava SASL `%s' ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "Napaka protokola SASL"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "V/I napaka: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sProsimo vpišite geslo POP za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -9544,35 +9738,35 @@ msgstr ""
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Nisem mogel vejiti programa sendmail: %s: pošta ni bila poslana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nisem mogel poslati sporočila: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "program sendmail je zaključil s signalom %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nisem mogel izvršiti %s: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "program sendmail je zaključil s stanjem %d: pošta ni bila poslana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "program sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9682,41 +9876,41 @@ msgstr "Začasna napaka avtentifikacije"
 msgid "Authentication required"
 msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Napaka pri pozdravu: %s: morda ni usodna"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Napaka v odgovoru na QUIT"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 msgid "server does not appear to support SSL"
 msgstr "zdi se, da strežnik n e podpira SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Zahtevek STARTTLS je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 msgid "STARTTLS response error"
 msgstr "Napaka v odgovoru na STARTTLS"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sProsim vpišite geslo SMTP za %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9727,90 +9921,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Napaka v odgovoru na RSET"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Zahtevek AUTH ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "Napaka v ogovoru na MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr ""
 "Zahtevek RCPT TO je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr ""
@@ -9819,88 +10013,88 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "Napaka v odgovoru na DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Zahtevek DATA je prekoračil časovno omejitev: konec sporočila: %s: pošta ni "
 "bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "Napaka v odgovoru za končanje DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Zahtevek RSET je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "Napaka v odgovoru na RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Zahtevek AUTH je prekoračil časovno omejitev: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "Napaka v odgovoru na QUIT"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Ne morem pripeti datoteke %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Ne morem pripeti datoteke %s: ni običajna datoteka"
@@ -9918,56 +10112,60 @@ msgid "MIME type:"
 msgstr "Vrsta MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Od:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Od:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporočila"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9975,17 +10173,25 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporočila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporočila."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Nisem mogel ustvariti konteksta podpisovanja PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9994,34 +10200,34 @@ msgstr ""
 "Napaka ob branju datoteke %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Opozorilo!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Datoteka obstaja, prepiši?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napaka ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Napaka ob dostopanju do datoteke: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10030,7 +10236,7 @@ msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10039,7 +10245,7 @@ msgstr ""
 "Nisem mogel odsekati datoteke: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10048,7 +10254,7 @@ msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10056,7 +10262,7 @@ msgstr ""
 "Evolucija je zaznala neshranjene datoteke iz prejšnjih sej.\n"
 "Jih želite poskusiti obnoviti?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10066,43 +10272,39 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Vstavi datoteko"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Podpisi"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (privzeto)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Sestavi novo sporočilo"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10110,7 +10312,7 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10118,9 +10320,9 @@ msgstr ""
 "Nisem mogel ustvariti okna skladatelja:\n"
 "Ne morem aktivirati komponente urejevalnika HTML."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10184,8 +10386,8 @@ msgstr "Zadeva vsebuje"
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10193,12 +10395,11 @@ msgstr ""
 "Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Zapomni si geslo"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
 
@@ -10296,150 +10497,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "leto"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "let"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr " sekund"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "mesec"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minuta"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "mesecev"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "ura"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "teden"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "tedenov"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "ura"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "mesec"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minuta"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "mesecev"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr " sekund"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "leto"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "let"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Pozabili ste izbrati datum."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Izbrali ste neveljaven datum."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Datum tega sporočila bo primerjan s\n"
-"časom ob katerem se bo pognal filter\n"
-"ali vmapa odprta."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
-"ki ga navedete tu."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom\n"
-"relativnim glede na čas zagona filtra;\n"
-".na primer \"teden dni nazaj\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "trenutni čas"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "čas, ki ga navedete"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "čas, relatievn trenutnemu"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Izberi čas s katerim naj se primerja"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Primerjaj z"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "sedaj"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " nazaj "
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "nazaj"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " nazaj "
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<kliknite tukaj za izbiro datuma>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Izberi čas s katerim naj se primerja"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Navedite ime datoteke:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Odpri datoteko"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Potem"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Dodaj dejanje"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10447,12 +10598,12 @@ msgstr ""
 "Pozabili ste izbrati mapo.\n"
 "Pojdite nazaj in navedite veljavno mapo v katero naj se dostavlja pošta."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10461,91 +10612,167 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Pomembno"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Delam"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Priština"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Seznam opravil"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Filtru morate dati ime."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Če"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Izvrši dejanja"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "če je zadoščeno vsem pogojem"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "če je zadoščeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "dohodna"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "odhodna"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Primerjaj z"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom\n"
+"relativnim glede na čas zagona filtra;\n"
+".na primer \"teden dni nazaj\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "čas, relatievn trenutnemu"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "le izbrane mape"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "trenutni čas"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "čas, ki ga navedete"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "z vsemi aktivnimi oddaljenimi mapami"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "z vsemi krajevnimi mapami"
 
@@ -10572,42 +10799,42 @@ msgid "Beep"
 msgstr "Pisk"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Podjetje"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Zbrisano"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "se ne konča z"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "ne obstaja"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ne obstaja"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "ne zveni kot"
@@ -10629,88 +10856,84 @@ msgid "ends with"
 msgstr "se konča z"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Izvedi ukaz lupine"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Navezava"
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Pomembno"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "je po"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "je pred"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "je večje"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "je manjše"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "is not Flagged"
 msgstr "ni označeno"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "oznaka9"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Dopisni seznam"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Jedro sporočila"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Glava sporočila"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Izvedi ukaz lupine"
+
 #: filter/libfilter-i18n.h:41
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Beri"
 
@@ -10726,57 +10949,86 @@ msgstr "Regularni izraz"
 msgid "Replied to"
 msgstr "Odgovorjeno na"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "je večje"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "je manjše"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Točke"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Nastavi stanje"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Izvedi ukaz lupine"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Velikost (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Izvorni račun"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Določena glava"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "se začne z"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Nastavi stanje"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Pravila"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
@@ -10784,11 +11036,11 @@ msgstr "Uredi pravilo"
 msgid "Score Rules"
 msgstr "Točke pravil"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "vMapi morate dati ime."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Kot vir morate navesti vsaj eno mapo."
 
@@ -10796,31 +11048,31 @@ msgstr "Kot vir morate navesti vsaj eno mapo."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Uvažam..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Prosim pokačajte"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Uvažam %s kot %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Pregledujem %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Pošta"
 
@@ -10881,39 +11133,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Smeti"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Pregledujem mapo"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Pričenjam uvoz"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Uredi filtre"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10995,12 +11247,12 @@ msgstr "Tovarna za komponento povzetka pošte."
 msgid "Font Preferences"
 msgstr "Nastavitve"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Poštni račun"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Nastavitve"
@@ -11049,7 +11301,7 @@ msgstr "Lastnosti..."
 msgid "Change this folder's properties"
 msgstr "Spremeni lastnosti te mape"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11057,58 +11309,78 @@ msgstr ""
 "Nekatere vaše nastavitve pošte se zdijo neveljavne. Prosim, preverite, če je "
 "vse v redu."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Niste nastavili postopka prenašanja pošte"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Sestavi novo sporočilo"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Novo sporočilo"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Na_tisni sporočilo"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Novo poštno sporočilo"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolucijine komponente za pošto."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Ne morem inicializirati Evolucijine komponente za nastavitev pošte."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Ne morem inicializirati Evolucijine komponente za podatke o mapah"
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Lastnosti za \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
@@ -11157,125 +11429,125 @@ msgstr "skupaj %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 msgid "VFolder on M_ailing List"
 msgstr "vMapa glede na dopisni seznam"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filter glede na dopisni seznam (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "vMapa glede na dopisni seznam (%s)"
@@ -11339,76 +11611,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Urejevalnik Evolucijinih novic"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Ste prepričani, da želite zbrisati ta račun?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Ne zbriši"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Resnično zbriši račun?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Izključi"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Vključi"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Vključeno"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Ime _računa:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portoriko"
@@ -11418,30 +11681,30 @@ msgstr "Portoriko"
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11453,7 +11716,7 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11465,7 +11728,7 @@ msgstr ""
 "ali skladate pošto.\n"
 "Bi ga želeli nastaviti sedaj?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11473,7 +11736,7 @@ msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11482,7 +11745,7 @@ msgstr ""
 "preden lahko skladate pošto."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11490,11 +11753,11 @@ msgstr ""
 "Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
 "takšne pošte:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11502,7 +11765,7 @@ msgstr ""
 "To poročilo nima 'zadeve'.\n"
 "Resnično pošlji?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11510,11 +11773,11 @@ msgstr ""
 "Ker je seznam kontaktov, ki mu pošiljate, nastavljen, da skrije seznam "
 "naslovov, bo to sporočilo vsebovalo le naslovnike bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "To sporočilo vsebuje le prejemnike bcc"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11524,15 +11787,11 @@ msgstr ""
 "To(očitno-za).\n"
 "Vseeno pošlji?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, če želiti poslati sporočilo."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11540,28 +11799,28 @@ msgstr ""
 "Ni mogoče odpreti mape osnutkov za ta račun.\n"
 "Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Prestavi sporočilo(a) v"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporočilo(a) v"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ste prepričani, da želite urediti vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11569,7 +11828,7 @@ msgstr ""
 "Urejate lahko le sporočila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11577,32 +11836,32 @@ msgstr ""
 "Znova lahko pošljete le sporočila\n"
 " iz mape Poslano."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Izbrano ni nilo nobeno sporočilo"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Shrani sporočila kot..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 msgid "Go to next folder with unread messages?"
 msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili?"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -11610,7 +11869,7 @@ msgstr ""
 "V tej mapi ni več novih sporočil.\n"
 "Želite iti v naslednjo mapo?"
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11622,7 +11881,7 @@ msgstr ""
 " \n"
 "Resnično zbriši ta sporočila? "
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11631,28 +11890,28 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "ZDA-pismo"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Tiskanje sporočila ni uspelo"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
@@ -11675,7 +11934,7 @@ msgstr "_Skripta"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 msgid "Unnamed"
 msgstr "Neimenovan"
 
@@ -11695,20 +11954,21 @@ msgid "Add Signature"
 msgstr "Dodaj nov podpis"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Prosimo spodaj vpišite svoje ime in e-poštni naslov. Polj \"po želji\" ni "
 "potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
 "jo boste pošiljali."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosim, spodaj vpišite podatke o vašem strežniku dohodne pošte. Če jih ne "
 "veste se obrnite na vašega sistemskega administratorja ali ponudnika dostopa "
@@ -11719,24 +11979,23 @@ msgid "Please select among the following options"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Prosim, spodaj vpišite podatke o načinu odpošiljanja pošte. Če jih ne veste "
 "se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
 "interneta."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "S procesom nastavljanja pošte ste skoraj pri koncu. Identiteta, strežnik "
 "prihajajoče pošte\n"
@@ -11746,44 +12005,20 @@ msgstr ""
 "prikaz."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Delam"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Priština"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Seznam opravil"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "po"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Račun %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Preverjam storitev"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -12045,226 +12280,214 @@ msgstr "Shrani in zapri"
 msgid "Loading Images"
 msgstr "Naloži _slike"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Prikaz _sporočila"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronezija"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Strežnik NNTP"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Uredi novičarski strežnik"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Podatki po želji"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, 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:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Natisni izbrane stike"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Zapo_mni si to geslo"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Potrebni podatki"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Privzeto"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Varnost"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Varni MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Izberi datoteko PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Nastavitev strežnika"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Bližnjice"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Izvorna koda"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Podatki o izvorni kodi"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12272,12 +12495,12 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12287,205 +12510,201 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "vzhod"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "Način _avtentifikacije: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Zbriši vse razen podpisa"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Vključi"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Polno ime:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Pot do izvršljive datoteke _PGP"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odgovori vsem"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Varnost"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 msgid "_Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_vsakih"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " barvo"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "oknonovic1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12509,202 +12728,212 @@ msgstr "Nisem mogel ustvariti konteksta ovojnice S/MIME."
 msgid "Could not create a S/MIME decode context."
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Nisem mogel ustvariti začasne datoteke '%s': %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Shrani na disk..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "zunanjem pregledovalniku"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Naloži _slike"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Nalagam vsebino sporočila"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Naloge s prekoračenim rokom:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Shrani povezavo kot"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Shrani sliko kot..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Slab naslov"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Od"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Za"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Shrani sporočilo kot..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "To sporočilo ima elektronski podpis. Za več podatkov kliknite na ikono "
 "ključavnice."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Nisem mogel ustvariti konteksta preverjanja PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "To sporočilo ima elektronski podpis in je ugotovljeno za avtentično."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Krajevne mape"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Prenastavljam mapo"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Ne morem shraniti meta podatkov mape; verjetno te mape ne boste mogli več "
 "odpreti: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ne morem shraniti meta podatkov mape v %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ne morem zbrisati meta podatkov mape %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12712,16 +12941,16 @@ msgstr ""
 "Če ne morete več odpreti tega poštnega predala, potem\n"
 "ga boste morda morali popraviti ročno."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ne morete spremeniti oblike zapisa map, ki niso krajevne."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Znova nastavi /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12730,7 +12959,7 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12739,7 +12968,7 @@ msgstr ""
 "Napaka ob opravljanju dejanja:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Delam"
 
@@ -12747,100 +12976,100 @@ msgstr "Delam"
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Sporočilo je bilo vseeno uspešno poslano."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Pošiljam \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12849,7 +13078,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12858,11 +13087,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12871,27 +13100,22 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Izvajam ukaz lupine: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "I_skanje"
 
@@ -12946,32 +13170,41 @@ msgstr "Pot: %s, vrsta: %s"
 msgid "Type: %s"
 msgstr "Vrsta: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Pošlji in spreji pošto"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Prekliči vse"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Posodabljam..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Zapomni si to geslo"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Pomni geslo do konca seje"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
@@ -13002,7 +13235,7 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Ime:"
 
@@ -13032,7 +13265,7 @@ msgstr "Posredovano sporočilo %s"
 msgid "Forwarded message"
 msgstr "Posredovano sporočilo"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Posredovano sporočilo"
 
@@ -13046,7 +13279,7 @@ msgstr "Nastavljam vMapo: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13059,94 +13292,97 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - sporočilo"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -13179,48 +13415,48 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Povratni klic"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Posreduj naprej"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Navezava"
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Predogled"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "FIXME: _Zastavica za nadaljevanje..."
@@ -13245,16 +13481,16 @@ msgstr "Naročam se na mapo \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Preklicujem naročnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapa"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
@@ -17717,11 +17953,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23137,8 +23373,8 @@ msgstr "Brez opisa"
 msgid "Mail summary"
 msgstr "Povzetek pošte"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
@@ -23156,15 +23392,15 @@ msgstr "LJLJ:LJMB:LJPZ"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com beseda dneva"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Citati dneva"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Dodaj vir novic"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Vpišite vir novic, ki ga želite dodati"
 
@@ -23176,25 +23412,25 @@ msgstr "Napaka ob prenašanju RDF"
 msgid "News Feed"
 msgstr "Viri novic"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Dodaj"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Sneži"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Brez nalog"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(ni opisa)"
 
@@ -24468,7 +24704,8 @@ msgid "Tasks "
 msgstr "Naloge "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Nastavitve vremena"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24525,7 +24762,7 @@ msgstr "Kaži podrobnosti"
 msgid "Cancel Operation"
 msgstr "Prekliči operacijo"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24539,20 +24776,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Dodaj pravilo vMape"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Dohodna pošta"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Odhodna pošta"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Poslano"
 
@@ -24789,22 +25026,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolucija - Ustvar novo mapo"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Vrsta izbrane mape ni veljavna za zahtevano\n"
-"operacijo."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Ustvari _novo mapo..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Nova..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
@@ -24826,7 +25056,7 @@ msgstr ""
 "Če ne veste, lahko izberete \"Samodejno\" in Evolucija bo poskusila "
 "ugotoviti."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Prosim, izberite podatke, ki jih želite uvoziti:"
 
@@ -24857,21 +25087,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Napaka Evolucije"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Uvažate lahko le v krajevne mape"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24880,11 +25106,11 @@ msgstr ""
 "Ni uvoznika, ki bi lahko obravnaval\n"
 " %s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Uvažam"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24893,17 +25119,17 @@ msgstr ""
 "Uvažam %s.\n"
 "Pričenjam %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Napaka ob zagonu %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Napaka ob nalaganju %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24912,31 +25138,31 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24944,24 +25170,24 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Poganjam pametne uvoznike"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Uvozi"
 
@@ -25007,9 +25233,14 @@ msgstr "Odpiram mapo %s"
 msgid "in \"%s\" ..."
 msgstr "Odpri v %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Ne morem ustvariti izbrane mape:\n"
 "%s"
@@ -25027,8 +25258,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Nisem mogel pognati Evolucijinega vmesnika za pomoč pri pošti\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Nov"
@@ -25069,57 +25300,58 @@ msgstr "Pojdi v mapo..."
 msgid "Select the folder that you want to open"
 msgstr "Izberite mapo, ki jo želite odpreti"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Ustvari novo bližnjico"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Izberite mapo na katero naj kaže bližnjica:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(brez)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25131,12 +25363,12 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25147,31 +25379,31 @@ msgstr ""
 "je nepričakovano zaključila. Morali boste zapreti in znova\n"
 "pognati Evolucijo, če želite dostopati do teh podatkov."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Generična napaka"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Ime skupine:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25180,107 +25412,117 @@ msgstr ""
 "Zares želite odstraniti skupino\n"
 "`%s' iz vrstice bližnjic?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Ne odstrani"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Preimenuj skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Preimenuj izbrano skupino bližnjic v:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Majhne ikone"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Kaži bližnjice kot majhne ikone"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Velike ikone"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Kaži bližnjice kot velike ikone"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nova skupina..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Odstrani to skupino..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Odstrani to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Preimenuj to skupino..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Preimenuj to skupino bližnjic"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Skrij vrstico z bližnjicami"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Ustvari novo bližnjico"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Ustvari novo bližnjico"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Preimenuj bližnjico"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Preimenuj izbrano bližnjico v:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Odpri mapo povezano s to bližnjico"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Odpri v novem _oknu"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Preimenuj to bližnjico"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Odstrani"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Odstrani to bližnjico iz vrstice bližnjic"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bližnjic."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
@@ -25288,55 +25530,55 @@ msgstr "Bližnjice"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom že obstaja"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Izbrana vrsta mape ni veljavna"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Mapa ni prazna"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Izbrana vrsta ni podprta v tem hranilniku"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Izbrane mape ni možno spremeniti ali odstraniti"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Mapa ne more postati otrok svojih potomcev"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Ne morem ustvariti mape s takšnim imenom"
 
@@ -25391,63 +25633,63 @@ msgstr ""
 "Napaka iz aktivacijskega sistema je:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Napaka CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Prekinjen"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Neveljaven argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Že ima lastnika"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Brez lastnika"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Ni bil(a) najden(a)"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Nepodprta vrsta"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Nepodprta shema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Nepodprto dejanje"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Obstaja"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Neveljaven URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Ima podmape"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Ni več prostora"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Star lastnik je umru"
 
@@ -25471,6 +25713,26 @@ msgstr "Gostitelj"
 msgid "The following connections are currently active:"
 msgstr "Sledeče povezave so trenutno aktivne:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Koledar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Stiki: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pošta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Naloge"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Ime mape:"
@@ -25483,6 +25745,34 @@ msgstr "Vrsta mape:"
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Ustvari _novo mapo..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Ime mape:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Strežniki"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Uporabniško ime:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolucijin druid za nastavitev"
@@ -25578,15 +25868,15 @@ msgstr "Ne sprašuj me več"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolucije se sedaj zapira..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25618,7 +25908,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -25627,37 +25917,37 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ne morem dostopati do lupine Ximian Evolucije."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Izključi začetni zaslon"
 
-#: shell/main.c:438
+#: shell/main.c:439
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:439
+#: shell/main.c:440
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25666,7 +25956,7 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
@@ -25701,113 +25991,107 @@ msgstr "Kopiraj izbrano"
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Ustvari nov stik"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Ustvari nov seznam stikov"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Zbriši izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Prestavi stik(e) v drugo mapo..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Prilepi odložišče"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Predogled stikov, ki bodo natisnjeni"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Predogled _tiskanja"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Shrani izbrane kontakte kot vVizitke"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Pošlji izbrane stike drugi osebi."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Poglej trenutni stik"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Seznam _stikov"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Posreduj stik..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Prestavi v _mapo..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Shrani kot vVizitko"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Išči po kontaktih"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Izberi vse"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Send Message to Contact..."
 msgstr "Pošlji _sporočilo stiku..."
 
@@ -25851,11 +26135,6 @@ msgstr "Mesec"
 msgid "Previews the calendar to be printed"
 msgstr "Predogled koledarja, ki bo natisnjen"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Predogled _tiskanja"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
@@ -25888,7 +26167,7 @@ msgstr "Teden"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Zapri"
 
@@ -25901,7 +26180,7 @@ msgid "Delete this item"
 msgstr "Zbriši ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Glavna orodna vrstica"
 
@@ -25913,8 +26192,8 @@ msgstr "Predogled natisnjenega predmeta"
 msgid "Print this item"
 msgstr "Natisni ta predmet"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Shrani"
 
@@ -25939,9 +26218,9 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -25951,7 +26230,7 @@ msgstr "Natisni kuverto..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Shrani _kot..."
 
@@ -25965,8 +26244,8 @@ msgstr "Pošlji _sporočilo stiku..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Shrani"
 
@@ -26063,26 +26342,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Novo sporočilo"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Prestavi sporočilo v novo mapo"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Kaži okno predogleda sporočila"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naroči se ali prekliči naročnino na mape z oddaljenih strežnikov"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtri..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Naroči se na mape..."
 
@@ -26179,7 +26468,7 @@ msgstr "Niten seznam sporočil"
 msgid "_Expunge"
 msgstr "_Uniči"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Mapa"
 
@@ -26424,174 +26713,189 @@ msgid "P_revious Unread Message"
 msgstr "P_rejšnje neprebrano sporočilo"
 
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "Odgovor na nalogo"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Preveri za nova sporočila v vseh mapah"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Pr_ejšnje pomembno sporočilo"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočila, ki bo natisnjeno"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Prejšnje"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Izbrano sporočilo nekomu posreduj"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Išči v sporočilu..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Manjša"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Shrani sporočilo kot datoteko z besedilom"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Išči besedilo v telesu prikazanega sporočila"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Nastavi lastnosti strani za vaš trenutni tiskalnik"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Kaži _izvorno kodo pošte"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Kaži celotne _glave"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Kaži sporočila v običajnem slogu"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Kaži sporočila s celotnimi glavami"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Kaži neposredno izvorno kodo sporočila"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Velikost besedila"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Odbriši izbrana sporočila"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "vMapa glede na poštni se_znam..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "vMapa glede na _pošiljatelja..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "vMapa glede na pre_jemnike..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "vMapa glede na p_redmet"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Sporočilo _posreduj naprej"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "Kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "_Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "_Preimenuj..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Orodja"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Zapri to okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Zapri"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "Po_gled"
 
@@ -26619,169 +26923,161 @@ msgstr "Šifriraj to sporočilo z S/MIME šifrirnim certifikatom"
 msgid "For_mat"
 msgstr "O_blika"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Vstavi _datoteko z besedilom..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Vstavi datoteko v sporočilo kot besedilo"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Vstavi datoteko z besedilom..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Odpri"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Šifriraj s PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Podpis s PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Šifriraj s S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Podpis s S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Shrani kot"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Shrani _osnutek"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Shrani v mapo..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko pod drugim imenom"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Pošlji"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Pošilji _kaseneje"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Pošlji _kasneje"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Pošlji pošto v HTML obliki"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Pošlji sporočilo kasneje"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Takoj pošlji to sporočilo"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Kaži / skrij priloge"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Kaži priloge"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Podpiši to sporočilo s svojim PGP ključem"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpiši to sporočilo s svojim S/MIME podpisnim certifikatom"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Preklopi prikaz polja BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Preklopi prikaz polja CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Preklopi prikaz izbirnika Od"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Priloga..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Polje _bcc"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Polje _cc"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Zbriši vse"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Polje _od"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Odpri..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na:"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Shrani predmet in zapri dialog"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Pomoč"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Datoteka s podpisom"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naročenih map"
@@ -26875,171 +27171,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Dodaj v vrstico z _bližnjicami"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolucija "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiraj mapo"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Ustvari bližnjico na to mapo v vrstici bližnjic"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Ustvari novo bližnjico"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Ustvari novo mapo"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Zbriši to mapo"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Pokaži drugo mapo"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Okno Evolucije"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Uvozi podatke iz drugih programov"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Prestavi to mapo na drugo mesto"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Ustvari _novo mapo..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Odpri v novem oknu"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Odpri to mapo v drugem oknu"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Nastavitve pilota..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Nastavitev pošte"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Preklopi"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bližnjicami"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Preklopi delo z mrežo"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Poglej izbrane mape"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "_Pogosto zastavljena vprašanja"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopiraj..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Vrstica map"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mapa"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Prestavi..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Nova mapa"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Nastavitve pilota..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Nastavitve poslov..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Bližnjica"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Vrstica z bližnjicami"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Bližnjica"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Natisni povzetek"
@@ -27053,17 +27380,40 @@ msgid "Reload the view"
 msgstr "Znova naloži ta pogled"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Vizitke"
+#, fuzzy
+msgid "By _Company"
+msgstr "Po podjetju"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Po podjetju"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Vizitke"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Seznam telefonov"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Tedenski pogled"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dnevni pogled"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Mesečni pogled"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Pogled delavnega tedna"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Kot mapa poslanih"
@@ -27088,13 +27438,19 @@ msgstr "Po zadevi"
 msgid "Messages"
 msgstr "Sporočila"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "S kategorijo"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Naloga"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27246,11 +27602,11 @@ msgstr "Nabor znakov"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Urejevalnik iskanja"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Shrani iskanje"
 
@@ -27288,20 +27644,20 @@ msgstr "Sporočilo"
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "_Išči sedaj"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Počisti"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Išči sedaj"
 
@@ -27315,18 +27671,171 @@ msgstr "Strežnik osebnega adresarja"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Strežnik osebnega koledarja; tovarna koledarjal"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): nisem mogel inicializirati GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): nisem mogel inicializirati GNOMEa"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+#~ "To se lahko zgodi, če se komponenta evolution-addressbook sesuje.\n"
+#~ "Da bi nam pomagali bolje razumeti in na koncu rešiti ta problem,\n"
+#~ "prosim pošljite e-pošto na Jon Trowbridge <trow@ximian.com>.\n"
+#~ "Vsebuje naj podroben opis okoliščin v katerih se je ta napaka tgodila.\n"
+#~ "Hvala."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolucija ne more dobiti krajevne hrambe adresarja.\n"
+#~ "V normalnih okoliščinah se to nikoli ne bi smelo zgoditi.\n"
+#~ "Za rešitev tega problema boste morali zapustiti in znova\n"
+#~ "pognati Evolucijo."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Prestavi..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Stanje sestanka se je spremenilo. Pošlji posodobljeno različico?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Zbriši ta sestanek"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Proizvedel: %s\n"
+#~ "Zadeva: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "Napaka protokola SASL"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "V/I napaka: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Napaka pri pozdravu: %s: morda ni usodna"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Zahtevek HELO je prekoračil časovno omejitev: %s: ni usodno"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Napaka v odgovoru na HELO: %s: ni usodno"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Zahtevek QUIT je prekoračil časovno omejitev: %s: ni usodno"
+
+#~ msgid "Insert File"
+#~ msgstr "Vstavi datoteko"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Izbrali ste neveljaven datum."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Datum tega sporočila bo primerjan s\n"
+#~ "časom ob katerem se bo pognal filter\n"
+#~ "ali vmapa odprta."
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Podjetje"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Urejevalnik Evolucijinih novic"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Ste prepričani, želite zbrisati ta novičarski račun?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Nastaviti morate račun preden lahko pošljete to e-pošto."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Strežnik NNTP"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Uredi novičarski strežnik"
+
+#~ msgid "Source"
+#~ msgstr "Izvorna koda"
+
+#~ msgid "Source Information"
+#~ msgstr "Podatki o izvorni kodi"
+
+#~ msgid "newswindow1"
+#~ msgstr "oknonovic1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Shrani na disk..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Shrani sporočilo kot..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Izvajam ukaz lupine: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolucija - Ustvar novo mapo"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Vrsta izbrane mape ni veljavna za zahtevano\n"
+#~ "operacijo."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Uvažate lahko le v krajevne mape"
+
+#~ msgid "_Contact List"
+#~ msgstr "Seznam _stikov"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Vstavi _datoteko z besedilom..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Vstavi datoteko v sporočilo kot besedilo"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Vstavi datoteko z besedilom..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Pošilji _kaseneje"
+
+#~ msgid "Send _later"
+#~ msgstr "Pošlji _kasneje"
+
+#~ msgid "Send the message later"
+#~ msgstr "Pošlji sporočilo kasneje"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Nastavitve pilota..."
+
 #~ msgid "Edit Addressbook"
 #~ msgstr "Uredi adresar"
 
@@ -27683,9 +28192,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Mapa v kateri se hrani pošta (notranja)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Nisem se mogel povezati s hrambo: %s"
-
 #~ msgid "Create vFolder from Search"
 #~ msgstr "Ustvari vMapo iz iskanja"
 
@@ -27821,9 +28327,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Organization:"
 #~ msgstr "_Organizacija:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Zapomni si to geslo"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "Privzeto pošiljaj pošto v _HTML obliki."
 
@@ -27893,15 +28396,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Ustvari _nov sestanek"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Ustvari nov sestanek"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Ustvari nov zahtevek za sestanek"
-
-#~ msgid "Create a new task"
-#~ msgstr "Ustvari nov posel"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Ustvari sestanek, ki zavzame cel dan"
 
@@ -28272,9 +28766,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ "To se bo povezalo s strežnikom POP in uporabilo Kerbos 4 za ustrezno "
 #~ "avtentifikacijo."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Nisem se mogel povezati s strežnikom: %s."
 
@@ -28330,9 +28821,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "New List"
 #~ msgstr "Nov seznam"
 
-#~ msgid "New Message"
-#~ msgstr "Novo sporočilo"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Posreduj _pripeto"
 
@@ -29122,9 +29610,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Set task view preferences"
 #~ msgstr "Nastavi pogled opravila"
 
-#~ msgid "Tasks Preferences..."
-#~ msgstr "Nastavitve poslov..."
-
 #~ msgid "TasksPreferences"
 #~ msgstr "Nastavitve opravil..."
 
@@ -29484,9 +29969,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Apply any new filters to the mail in this box"
 #~ msgstr "Uveljavi vse nove filtre pošti tega predala"
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Prestavi sporočilo v novo mapo"
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "Kaži vse glave sporočil"
 
@@ -29809,9 +30291,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Strežnik odhodne pošte"
 
-#~ msgid "Servers"
-#~ msgstr "Strežniki"
-
 #~ msgid "_Addressbook Configuration..."
 #~ msgstr "Nastavitev _adresarja..."
 
@@ -29842,9 +30321,6 @@ msgstr "init_bonobo(): nisem mogel inicializirati Bonoba"
 #~ msgid "_Open in New Window"
 #~ msgstr "_Odpri v novem oknu"
 
-#~ msgid "_Print Message"
-#~ msgstr "Na_tisni sporočilo"
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
 
diff --git a/po/sv.po b/po/sv.po
index 4033c29e83..f578422387 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.152 2002/06/27 19:55:17 jpr Exp $
+# $Id: sv.po,v 1.153 2002/08/13 12:27:52 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-04-01 01:16+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "Importerar VCard-filer till Evolution."
 msgid "File As"
 msgstr "Arkivera som"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Namn"
@@ -348,45 +348,45 @@ msgstr "VCard för %s"
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Söker..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Läser in..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Fel i sökuttryck."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Lägger till kort till LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Tar bort kort från LDAP-server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Modifierar kort från LDAP-servern..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Startar om sökningen."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Mottar LDAP-sökresultat..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 msgid "Error performing search"
 msgstr "Fel vid sökning"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 msgid "Could not parse query string"
 msgstr "Kunde inte tolka frågesträng"
 
@@ -481,11 +481,11 @@ msgstr ""
 "genom användning av LDAP-protokollet"
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -501,22 +501,31 @@ msgstr "LDAP-server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP-server som innehåller kontaktinformation"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Skapa ny kontakt"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktlista"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Kontakt_lista"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Ny kontakt"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Kontakt"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Skapa ny kontaktlista"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -540,30 +549,30 @@ msgstr "Kunde inte tolka frågesträng"
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP-serversvaret innehöll inte %s-information"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Kunde inte initiera gnome-vfs"
 
@@ -571,11 +580,11 @@ msgstr "Kunde inte initiera gnome-vfs"
 msgid "Other Contacts"
 msgstr "Andra kontakter"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Kan inte öppna adressboken"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -585,7 +594,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -597,7 +606,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -605,42 +614,42 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "E-post är"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Avancerat..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Alla kategorier"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappbläddraren kommer att visa"
 
@@ -763,7 +772,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adressbokskällor"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -862,8 +871,8 @@ msgstr "Konfiguration"
 msgid "Mappings"
 msgstr "Marginaler"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_var"
@@ -918,8 +927,8 @@ msgstr "Sök_omfattning: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Söker"
 
@@ -1118,15 +1127,15 @@ msgid "Using email address"
 msgstr "E-postadress"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Lägg till"
 
@@ -1174,12 +1183,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Redigera"
@@ -1295,10 +1304,10 @@ msgstr "Fabrik för adressbokens namnvalsgränssnitt"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1327,42 +1336,15 @@ msgstr "(%d visas inte)"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Välj kontakter från adressboken"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Sök efter en kontakt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution kan inte få tag i det lokala adressbokslagret.\n"
-"Detta kan ha orsakats av att komponenten evolution-addressbook kraschar.\n"
-"För att hjälpa oss att bättre förstå och lösa detta problem en gång för\n"
-"alla kan du skicka ett brev till Jon Trowbridge <trow@ximian.com> med en\n"
-"detaljerad beskrivning av de omständigheter under vilket felet framträdde.\n"
-"Tack på förhand."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution kan inte få tag på det lokala adressbokslagret.\n"
-"Normalt bör detta aldrig inträffa. Du kan behöva avsluta\n"
-"och starta om Evolution för att åtgärda detta problem."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Välj kontakter från adressboken"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Markera namn"
@@ -1384,15 +1366,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Flytta..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Mapp:"
 
@@ -1498,11 +1475,12 @@ msgstr "Vill ha _HTML-post"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -2736,7 +2714,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "_Dölj adresser då e-post skickas till denna lista"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -2799,7 +2777,7 @@ msgstr ""
 "redan i den här mappen. Vill du lägga till den ändå?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
@@ -2826,21 +2804,21 @@ msgid "Error getting book view"
 msgstr "Fel vid hämtande av bokvy"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Lyckades"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -2848,8 +2826,8 @@ msgstr "Okänt fel"
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
@@ -2866,7 +2844,7 @@ msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2889,46 +2867,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Filen %s finns inte"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vill du spara ändringar?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Fel vid tillägg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Visa kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Visa kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2938,19 +2921,19 @@ msgstr ""
 "Du har begärt att %d kort ska vara kort. Detta kommer att orsaka att %d nya "
 "fönster visas på din skärm. Vill du verkligen visa alla dessa kort?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 msgid "Move card to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 msgid "Copy card to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 msgid "Move cards to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kopiera kort till"
 
@@ -3022,7 +3005,7 @@ msgstr "Adressbok"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Spara som VCard"
 
@@ -3062,7 +3045,7 @@ msgid "Pilot Settings..."
 msgstr "_Pilotinställningar..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
@@ -3071,8 +3054,8 @@ msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
@@ -3090,7 +3073,7 @@ msgid "Move to folder..."
 msgstr "Flytta till mapp..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
@@ -3101,20 +3084,20 @@ msgid "Copy"
 msgstr "Kopiera"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ta bort"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Aktuell vy"
@@ -3279,7 +3262,7 @@ msgstr "Marginaler"
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3369,26 +3352,26 @@ msgstr "Namnlöst möte"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Hög"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Låg"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Odefinierad"
@@ -3507,11 +3490,11 @@ msgstr "Slumringstid (minuter)"
 msgid "_Edit appointment"
 msgstr "_Redigera möte"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3523,13 +3506,13 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Varning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3546,7 +3529,7 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
@@ -3574,7 +3557,7 @@ msgstr "Beskrivningen innehåller"
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Omatchade"
 
@@ -3585,7 +3568,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3607,18 +3590,18 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Kunde inte skapa kalendervyn. Kontrollera din ORBit- och OAF-installation."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Konfidentiellt"
@@ -3643,37 +3626,37 @@ msgstr "Ö"
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Upptagen"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Pågår"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Färdigt"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3684,56 +3667,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Tilldelad"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Nej"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Dagsvy"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Arbetsveckovy"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Veckovy"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Månadsvy"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3741,12 +3723,12 @@ msgstr "Kalender"
 msgid "Folder containing appointments and events"
 msgstr "Mapp som innehåller möten och evenemang"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Uppgifter"
 
@@ -3754,37 +3736,55 @@ msgstr "Uppgifter"
 msgid "Folder containing to-do items"
 msgstr "Mapp som innehåller att-göra-objekt"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Nytt möte"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Möte"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Skapa ett nytt möte"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Möte"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Skapa en ny anteckning"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Skapa en ny uppgift"
+
+#: calendar/gui/component-factory.c:723
 msgid "New All Day Appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Nytt möte"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Möte"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Skapa ett nytt möte"
 
 #: calendar/gui/control-factory.c:123
 #, c-format
@@ -3853,7 +3853,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Med dessa argument:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "dagar"
 
@@ -3861,11 +3862,13 @@ msgstr "dagar"
 msgid "extra times every"
 msgstr "extra gånger var"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minut"
 
@@ -3993,7 +3996,7 @@ msgstr "Påminnelser"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -4022,7 +4025,7 @@ msgstr "slut på möte"
 msgid "hour(s)"
 msgstr "timme/timmar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -4201,7 +4204,7 @@ msgid "_Fri"
 msgstr "_fre"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "Allm_änt"
 
@@ -4246,19 +4249,33 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före slut på möte"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Mötestatusen har ändrats. Skicka en uppdaterad version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Är du säker på att du vill avboka och ta bort detta möte?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Är du säker på att du vill avbryta och ta bort denna uppgift?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Är du säker på att du vill avbryta ta bort denna dagbokspost?"
 
@@ -4328,61 +4345,61 @@ msgstr " (Ska utföras "
 msgid "Due "
 msgstr "Ska utföras "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
@@ -4581,7 +4598,7 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
@@ -4593,7 +4610,7 @@ msgstr "Roll"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
@@ -4677,7 +4694,7 @@ msgstr "vid"
 msgid "first"
 msgstr "första"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "sekund"
 
@@ -4701,7 +4718,7 @@ msgstr "lista"
 msgid "Other Date"
 msgstr "Annan fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "dag"
 
@@ -4799,20 +4816,26 @@ msgstr "% färdigt"
 msgid "Date Completed:"
 msgstr "Datum utfört:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Behöver åtgärd"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Förlopp"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Status:"
 
@@ -4826,7 +4849,7 @@ msgstr "Grundläggande"
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4895,76 +4918,76 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Öppna"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "_Tilldela uppgift"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "_Vidarebefordra som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Markera som färdig"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markera markerade uppgifter som färdiga"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Ta bort markerade uppgifter"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klicka för att lägga till en uppgift"
@@ -4973,8 +4996,8 @@ msgstr "Klicka för att lägga till en uppgift"
 msgid "Alarms"
 msgstr "Alarm"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Färdigt"
 
@@ -5002,11 +5025,9 @@ msgstr "Prioritet"
 msgid "Start Date"
 msgstr "Startdatum"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Sammanfattning"
 
@@ -5048,106 +5069,105 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "fm"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "em"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Nytt m_öte"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsarrangemang"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 msgid "New Meeting"
 msgstr "Nytt möte"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Konfigurera..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "_Konfigurera..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 msgid "_Schedule Meeting..."
 msgstr "_Boka möte..."
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Gör denna förekomst _flyttbar"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
@@ -5188,7 +5208,7 @@ msgstr "Uppgiften färdig: <b>"
 msgid "Task Due: <b>"
 msgstr "Uppgiften ska vara utförd: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
@@ -5197,334 +5217,339 @@ msgstr "iCalendar-information"
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Plats:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Okänd"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Uppdatera"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Mötesinformation"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> begär din närvaro vid ett möte."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Mötesförslag"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vill lägga till i ett befintligt möte."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vill få den senaste mötesinformationen."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Begäran av mötesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svarat på en mötesbegäran."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Mötessvar"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avbokat ett möte."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Mötesavbokning"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Felaktigt mötesmeddelande"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat mötesinformation."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> begär att du utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> begär din ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Ett fel uppstod när nyhetskällan hämtades"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarandestatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarandestatus kunde inte uppdateras på grund av ogiltig status!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Närvarandestatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarandestatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Välj mapp"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Välj mapp"
@@ -5570,7 +5595,7 @@ msgstr "startdatum"
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
@@ -5583,57 +5608,52 @@ msgid "Non-Participants"
 msgstr "Icke-deltagare"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Person"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grupp"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Resurs"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Rum"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Mötesordförande"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Behöver åtgärd"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Preliminärt"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Delegerat"
 
@@ -5723,48 +5743,45 @@ msgstr "Mötets _starttid:"
 msgid "Meeting _end time:"
 msgstr "Mötets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunde inte läsa in uppgifterna i \"%s\""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Kunde inte öppna mappen i \"%s\""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Färdigdatum"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Ta bort detta möte"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5775,11 +5792,16 @@ msgstr "Kunde inte öppna mappen i \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som krävs för att öppna \"%s\" stöds inte"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Öppnar kalender i %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Öppnar mappen %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -5836,51 +5858,56 @@ msgstr "oktober"
 msgid "September"
 msgstr "september"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Åtminstone en närvarande person krävs"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "En organisatör måste vara angiven."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Evenemangsinformation"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Journalinformation"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Kalenderinformation"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Uppdaterat"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr "Motförslag"
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Du måste vara närvarande på detta evenemang."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Kunde inte initiera Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Kunde inte skapa komponentredigerarfabriken"
 
@@ -6107,9 +6134,8 @@ msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -6144,8 +6170,8 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
@@ -6207,15 +6233,27 @@ msgstr "Importerar iCalendar-filer till Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerar vCalendar-filer till Evolution"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Kan inte hämta meddelande: %s från mappen %s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Kunde inte ansluta till lager: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr "Kalenderhändelser"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6223,84 +6261,84 @@ msgstr ""
 "Evolution har hittat Gnome-kalenderfiler.\n"
 "Vill du importera dem till Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 msgid "Gnome Calendar"
 msgstr "Gnome-kalendern"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 "argument 1 till make-time måste vara en datum-/tidssträng enligt ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day förväntar sig att argument 2 är ett heltal"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? förväntar sig att argument 2 är en time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? förväntar sig 2 argument"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? förväntar sig att argument 1 är en sträng"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? förväntar sig att argument 2 är en sträng"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6308,11 +6346,11 @@ msgstr ""
 "contains? förväntar sig att argument 1 är ett av \"any\", \"summary\", eller "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? förväntar sig minst 1 argument"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6320,19 +6358,19 @@ msgstr ""
 "has-categories? förväntar sig att alla argument är strängar eller att ett "
 "och endast ett argument är booleskt falsk (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? förväntar sig 0 argument"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? förväntar sig 1 argument"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? förväntar sig att argument 1 är en time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Evaluering av sökuttrycket gav inget booleskt värde"
 
@@ -7929,71 +7967,81 @@ msgstr "Lagrar mappen \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr "Du måste vara ansluten för att kunna genomföra denna åtgärd"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Synkroniserar mappar"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fel vid tolkning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fel vid körning av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Kan inte öppna spool-mappen"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hämtar meddelande %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Kan inte öppna meddelande"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Misslyckades med meddelande %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Synkroniserar mapp"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Misslyckades vid meddelande %d av %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Misslyckades med att hämta meddelande"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Ogiltiga argument"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Ogiltiga argument"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kunde inte skapa rör till %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
@@ -8049,7 +8097,7 @@ msgstr "Flyttar meddelanden"
 msgid "Copying messages"
 msgstr "Kopierar meddelanden till %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8057,47 +8105,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från POP-servern: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Inget filnamn är angivet."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan inte kryptera detta meddelande: inga mottagare är angivna"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8105,18 +8153,18 @@ msgid ""
 "%.*s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Kan inte verifiera detta meddelande: kunde inte skapa temporär fil: %s"
@@ -8142,22 +8190,22 @@ msgid "Could not lock '%s'"
 msgstr "Kunde inte låsa \"%s\""
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunde inte skapa låsfil för %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Gjorde time-out när låsfil skulle fås för %s. Försök igen senare."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Misslyckades med att få lås med fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
@@ -8216,11 +8264,16 @@ msgstr "Fel vid skrivande av temporär brevlådefil: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Fel vid kopierande av temporär brevfil: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Misslyckades med att dekryptera: Okänd"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Misslyckades med att dekryptera: Okänd"
@@ -8357,7 +8410,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -8535,33 +8588,134 @@ msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Misslyckades med att verifiera certifikat."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Utställare: %s\n"
-"Ämne: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Misslyckades med att verifiera certifikat."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Signaturfil:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Fel vid inläsning av %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Inte inne"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
 msgstr ""
-"Felaktigt certifikat från %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Vill du acceptera ändå?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Misslyckades med att verifiera certifikat."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Ogiltigt argument"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Certifikat-ID:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8574,16 +8728,33 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "DÅLIG"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Felaktigt certifikat från %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Vill du acceptera ändå?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8603,32 +8774,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Fel vid start av %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, 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:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
@@ -8636,12 +8812,12 @@ msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
@@ -8670,40 +8846,40 @@ msgstr "IMAP-serversvaret innehöll inte %s-information"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Oväntat OK-svar från IMAP-servern: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen förstördes och återskapades på servern."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 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:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Letar efter nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -8712,10 +8888,10 @@ msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 msgid "Could not open cache directory: %s"
 msgstr "Kunde inte öppna cachekatalogen: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Misslyckades med att cacha meddelande %s: %s"
@@ -8728,7 +8904,7 @@ msgstr "Kontroll av ny e-post"
 msgid "Check for new messages in all folders"
 msgstr "Kontrollera nya meddelanden i alla mappar"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Mappar"
 
@@ -8758,7 +8934,7 @@ msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Lösenord"
 
@@ -8767,71 +8943,75 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s-tjänst för %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunde inte ansluta till %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-tillägg stöds inte."
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Mappen är inte tom"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8842,31 +9022,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Mappnamnet kan inte innehålla returtecknet."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Kan inte öppna brevlåda: %s %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8888,7 +9074,10 @@ msgid "Local delivery"
 msgstr "Lokal leverans"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "För hämtande av lokal e-post i mbox-standardformaterade brevlådor."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8916,12 +9105,12 @@ msgstr "Unix mbox-standardbrevlåda"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "För läsande och lagrande av lokal e-post i mbox-standardspoolfiler."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8932,38 +9121,38 @@ msgstr "Lagringsroten %s är inte en absolut sökväg"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på mappen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
@@ -9023,7 +9212,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9061,24 +9250,24 @@ msgstr "är inte en brevlådekatalog"
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan inte öppna sökvägen till brevlådekatalogen: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 msgid "Checking folder consistency"
 msgstr "Kontrollerar mappkonsekvens"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 msgid "Checking for new messages"
 msgstr "Kontrollerar nya meddelanden"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Lagrar mapp"
@@ -9122,7 +9311,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9131,7 +9320,7 @@ msgstr ""
 "Kan inte öppna filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9140,14 +9329,14 @@ msgstr ""
 "Kunde inte skapa filen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" är ingen vanlig fil."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9156,7 +9345,7 @@ msgstr ""
 "Kunde inte ta bort mappen \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
@@ -9171,64 +9360,64 @@ msgstr "Kunde inte öppna mapp: %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan inte kontrollera mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunde inte öppna fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte öppna temporär brevlåda: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Okänt fel: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunde inte byta namn på mapp: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fel vid skrivning till temporär brevlåda: %s: %s"
@@ -9380,47 +9569,47 @@ msgstr "Använd avbryt"
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Hämtar POP-sammanfattning"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "Användaren avbröt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan inte hämta POP-sammanfattning: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Tömmer borttagna meddelanden"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Inget meddelande med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan inte hämta meddelande %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -9437,7 +9626,7 @@ msgstr "Lämna meddelanden på servern"
 msgid "Delete after %s day(s)"
 msgstr "Ta bort efter %s dag(ar)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9464,6 +9653,11 @@ msgstr ""
 "krypterat lösenord via APOP-protokollet. Det här kanske inte fungerar för "
 "alla användare även med servrar som sägs stöda detta."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Kunde inte ansluta till %s (port %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9472,55 +9666,57 @@ msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till POP-servern %s i säkert läge: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:351
-#, c-format
-msgid "Could not connect to POP server on %s"
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s"
 msgstr "Kunde inte ansluta till POP-servern på %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Kan inte ansluta till POP-servern.\n"
 "Inget stöd för begärd autentiseringsmekanism."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL \"%s\"-inloggning misslyckades: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL-protokollfel"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "I/O-fel: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Kunde inte autentisera till KPOP-server: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sAnge ett POP3-lösenord för %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Kan inte ansluta till POP-server.\n"
 "Fel vid skickande av lösenord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9546,35 +9742,35 @@ msgstr "Kunde inte skapa rör till sendmail: %s: brevet skickades inte"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunde inte grena sendmail: %s: brevet skickades inte"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunde inte skicka meddelande: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avslutade med signal %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunde inte köra %s: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avslutade med status %d: brevet skickades inte."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9684,45 +9880,45 @@ msgstr "Tillfälligt autentiseringsmisslyckande"
 msgid "Authentication required"
 msgstr "Autentisering krävs"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Kunde inte ansluta till POP-servern,\n"
 "Fel vid skickande av filnamn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sAnge SMTP-lösenordet för %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9733,89 +9929,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-epostleverans via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Skickar meddelande"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan inte skicka meddelande: inga mottagare är angivna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan inte skicka meddelande: en eller flera ogiltiga mottagare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP-hälsning"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO-begäran gjorde time-out: %s: inte ödesdigert"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Fel i HELO-svar: %s: inte ödesdigert"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET-begäran gjorde time-out: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Fel vid skapande av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH-begäran misslyckades."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Felaktigt autentiseringssvar från servern.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Fel i MAIL FROM-svar: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO-begäran gjorde time-out: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
@@ -9823,91 +10019,91 @@ msgstr "DATA-begäran gjorde time-out: %s: brevet skickades inte"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA-skickande gjorde time-out: meddelandeslut: %s: brevet skickades inte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Felaktigt autentiseringssvar från servern."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT-begäran gjorde time-out: %s: inte ödesdigert"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH-begäran gjorde time-out: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Fel i RSET-svar: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan inte bifoga filen %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan inte bifoga filen %s: inte en vanlig fil"
@@ -9925,56 +10121,60 @@ msgid "MIME type:"
 msgstr "MIME-typ:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Klicka här för att ta fram adressboken"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Från:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Svara till:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Från:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Till:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Ange meddelandets mottagare"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ange adresserna som ska få en kopia av meddelandet"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Blindkopia:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9982,17 +10182,25 @@ msgstr ""
 "Ange adresserna till de som ska ta emot en extra kopia av meddelandet utan "
 "att visas i mottagarlistan av meddelandet."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Kunde inte skapa ett PGP-signatursammanhang."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10001,34 +10209,34 @@ msgstr ""
 "Fel vid läsning av filen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Varning!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Filen finns, skriv över?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inläsning av filen: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Fel vid åtkomst av filen: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10037,7 +10245,7 @@ msgstr ""
 "Kan inte spola filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10046,7 +10254,7 @@ msgstr ""
 "Kan inte trunkera filen: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10055,7 +10263,7 @@ msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10063,7 +10271,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10073,43 +10281,39 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Varning: Ändrat meddelande"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Infoga fil"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Spara signatur"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (standard)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10117,7 +10321,7 @@ msgstr ""
 "Kan inte skapa redigerarfönstret:\n"
 "Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10125,9 +10329,9 @@ msgstr ""
 "Kunde inte skapa redigerarfönstret:\n"
 "Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10191,8 +10395,8 @@ msgstr "Ämnet innehåller"
 msgid "Subject does not contain"
 msgstr "Ämnet innehåller inte"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10200,12 +10404,11 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Kom ihåg detta lösenord"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Kom ihåg detta lösenord för resten av denna session"
 
@@ -10303,150 +10506,100 @@ msgstr "%H.%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "år"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "år"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "sekunder"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "månad"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "minut"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "månader"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "timme"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "vecka"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "veckor"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "timme"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "månad"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "minut"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "månader"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "sekunder"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "år"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "år"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Du har glömt att välja ett datum."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Du har valt ett ogiltigt datum."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"den tid då filtret körs eller en virtuell\n"
-"mapp öppnas."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"datumet som du anger här."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Meddelandedatumet kommer att jämföras med\n"
-"en tid som är relativ till den då filtret\n"
-"körs; \"en vecka sedan\" till exempel."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "aktuell tid"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "en tid du anger"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "en tid som är relativ till aktuell tid"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Välj en tid att jämföra med"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Jämför med"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<klicka här för att välja ett datum>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "nu"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " sedan"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr " sedan"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %H.%M"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<klicka här för att välja ett datum>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Välj en tid att jämföra med"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Ange filnamn:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool-filen \"%s\" finns inte eller är ingen vanlig fil"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Välj en åtgärd:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Då"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Lägg till åtgärd"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10454,12 +10607,12 @@ msgstr ""
 "Du glömde välja en mapp.\n"
 "Gå tillbaka och ange en giltig mapp som e-post kan levereras till."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10468,92 +10621,168 @@ msgstr ""
 "Fel i reguljära uttrycket \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "viktigt"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Att-göra-lista"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "efter"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Du måste ge detta filter ett namn."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Regelnamn: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Om"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Utför åtgärder"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "om alla villkor uppfylls"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "om något villkor uppfylls"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Lägg till villkor"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "inkommande"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "utgående"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Jämför med"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Redigera filter"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Utgående"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Meddelandedatumet kommer att jämföras med\n"
+"datumet som du anger här."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Meddelandedatumet kommer att jämföras med\n"
+"en tid som är relativ till den då filtret\n"
+"körs; \"en vecka sedan\" till exempel."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Meddelandedatumet kommer att jämföras med\n"
+"datumet som du anger här."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "en tid som är relativ till aktuell tid"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr " sedan"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "endast specifika mappar"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "aktuell tid"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "en tid du anger"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Källor för virtuella mappar"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "med alla aktiva fjärrmappar"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "med alla lokala och aktiva fjärrmappar"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "med alla lokala mappar"
 
@@ -10581,42 +10810,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Företag"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "innehåller"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiera till mapp"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ankomstdatum"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Avsändningsdatum"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "slutar inte med"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "finns inte"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "finns inte"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "låter inte som"
@@ -10638,92 +10867,88 @@ msgid "ends with"
 msgstr "slutar med"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Kör skalkommando"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "finns"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Uttryck"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "viktigt"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "är"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "är efter"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "är innan"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "är större än"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "är mindre än"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "är inte"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Flaggad"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Sändlista"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "meddelandetext"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "meddelandehuvud"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Flytta till mapp"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Kör skalkommando"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Spela ljud:"
 
 # [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Läst"
 
@@ -10739,57 +10964,87 @@ msgstr "Reguljärt uttryck matchar"
 msgid "Replied to"
 msgstr "besvarad"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "är större än"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "är mindre än"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Poäng"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Avsändare"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ställ in status"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Kör skalkommando"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Storlek (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "låter som"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Källkonto"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Specifikt huvud"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "börjar med"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Ämne"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Ställ in status"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Lägg till regel"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Redigera regel"
 
@@ -10797,11 +11052,11 @@ msgstr "Redigera regel"
 msgid "Score Rules"
 msgstr "Poängregler"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Du måste ge denna virtuella mapp ett namn."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du måste ange minst en mapp som källa."
 
@@ -10809,31 +11064,31 @@ msgstr "Du måste ange minst en mapp som källa."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Importerar..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerar %s som %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Genomsöker %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "E-post"
 
@@ -10894,39 +11149,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Genomsöker IMAP-mappen"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Genomsöker katalog"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Startar import"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Inställningar"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Redigera filter"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11008,12 +11263,12 @@ msgstr "Fabrik för e-postsammanfattningskomponenten."
 msgid "Font Preferences"
 msgstr "Inställningar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Epostkonton"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Inställningar"
@@ -11065,7 +11320,7 @@ msgstr "Egenskaper..."
 msgid "Change this folder's properties"
 msgstr "Ändra egenskaperna för denna mapp"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11073,58 +11328,78 @@ msgstr ""
 "En del av dina e-postinställningar verkar felaktiga, kontrollera att allt är "
 "som det ska vara."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Du har inte angivit någon e-posttransportmetod"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Varning: Ändrat meddelande"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Skriv ett meddelande"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Nytt meddelande"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Skriv _ut meddelande"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Nytt e-postmeddelande"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Kan inte initiera Evolutions e-postkonfigurationskomponent."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Kan inte initiera Evolutions mappinformationskomponent."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Ansluter till server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lager hos skal"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper för \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunde inte skapa temporär katalog: %s"
@@ -11174,135 +11449,135 @@ msgstr "%d totalt"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från meddelande"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Färdigt"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Ställ flagga"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Markera som läst"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovikti_gt"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adressboken"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Tillämpa filter"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Skapa rege_l från meddelande"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Virtuell mapp på sändlista"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrera på sändlista (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Virtuell mapp på sändlista (%s)"
@@ -11366,76 +11641,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolutions diskussionsgruppsredigerare"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa två konton med samma namn."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du säker på att du vill ta bort detta konto?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Ta inte bort"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Verkligen ta bort kontot?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Stäng av"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Slå på"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Påslagen"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontonamn:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -11445,30 +11711,30 @@ msgstr "Puerto Rico"
 msgid "Mail to %s"
 msgstr "E-post till %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnet är %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post från %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11480,7 +11746,7 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11492,7 +11758,7 @@ msgstr ""
 "ta emot eller skriva nya brev.\n"
 "Vill du konfigurera den nu?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11500,7 +11766,7 @@ msgstr ""
 "Du måste konfigurera en identititet\n"
 "innan du kan skriva brev."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11509,7 +11775,7 @@ msgstr ""
 "innan du kan skriva brev."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11517,11 +11783,11 @@ msgstr ""
 "Du skickar ett HTML-formaterat brev, men följande mottagare vill inte ha "
 "HTML-formaterad e-post:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Skicka ändå?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11529,7 +11795,7 @@ msgstr ""
 "Detta meddelande har inget ämne.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11537,11 +11803,11 @@ msgstr ""
 "Eftersom kontaktlistan som du skickar är konfigurerad att dölja listans "
 "adresser kommer detta meddelande endast att innehålla blindkopiemottagare."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Detta meddelande innehåller endast blindkopiemottagare."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11551,15 +11817,11 @@ msgstr ""
 "till ett Apparently-To-huvud.\n"
 "Skicka ändå?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Du måste ange mottagare för att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Du måste konfigurera ett konto innan du kan skicka brevet."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11567,28 +11829,28 @@ msgstr ""
 "Kan inte öppna utkastmappen för detta konto.\n"
 "Vill du använda standardmappen för utkast?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Är du säker på att du vill redigera alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11596,7 +11858,7 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Utkast."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11604,39 +11866,39 @@ msgstr ""
 "Du kan bara skicka om meddelanden\n"
 "som du sparat i mappen Skickat."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Inget meddelande markerat"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Skriv över fil?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Visa nästa olästa meddelande"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11649,7 +11911,7 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa meddelanden?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11658,28 +11920,28 @@ msgstr ""
 "Fel vid läsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Hämtar meddelande %d av %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11701,7 +11963,7 @@ msgstr "_Säkerhet"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlös kontakt:"
@@ -11722,20 +11984,21 @@ msgid "Add Signature"
 msgstr "Spara signatur"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Ange ditt namn och din e-postadress nedan. De \"valfria\" fälten nedan "
 "behöver du inte fylla i,\n"
 "såvida du inte vill inkludera denna information i den e-post du skickar."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Ange information om din server för inkommande e-post nedan. Om du inte är "
 "säker bör du kontakta din\n"
@@ -11746,24 +12009,23 @@ msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Ange information om hur du vill skicka e-post. Om du inte är säker bör du "
 "kontakta din\n"
 "systemadministratör eller Internetleverantör."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Du är nästan färdig med din e-postkonfiguration. Identiteten, den inkommande "
 "e-postservern och\n"
@@ -11773,44 +12035,20 @@ msgstr ""
 "Detta namn kommer endast att användas för visning."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Att-göra-lista"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "efter"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Konto"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Kontrollerar tjänst"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
@@ -12075,229 +12313,217 @@ msgstr "Spara och stäng"
 msgid "Loading Images"
 msgstr "Läs in _bilder"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Meddelanden"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "M_eddelandevisning"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Mikronesien"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP-server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "Redigera diskussionsgruppsserver"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Valfri information"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP-_nyckelid:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Skriv ut markerade kontakter"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Kan inte öppna meddelande"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Ko_m ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Svara till:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Kom ihåg detta lösenord"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Obligatorisk information"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr " (standard)"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Säkerhet"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Säker MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Välj PGP-program"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Genvägar"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Spara signatur"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Källkod"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Källinformation"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Ange filnamn:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -12306,12 +12532,12 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till dessa servrar, "
 "till exempel: \"Jobb\" eller \"Hemma\"."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12321,210 +12547,206 @@ msgstr ""
 "\n"
 "Klicka på \"Nästa\" för att börja. "
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Öst"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Autentiseringstyp: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Autentiseringstyp: "
 
 # Låter konstigt
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Kontrollera _automatiskt ny e-post"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Kontrollera _automatiskt ny e-post"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Standardvärden"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Slå på"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Fullständigt namn:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "I HTML-brev"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Identitet"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Gör detta till mitt standard_konto"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Sökväg till _PGP-programmet:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Standardstil för vidarebefordran är: "
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Restore defaults"
 msgstr " (standard)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Säkerhet"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Visa tid som"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "_Signaturfil:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Använd s_äker anslutning (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Variabel"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_var"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " färg"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12548,201 +12770,211 @@ msgstr "Kunde inte skapa ett S/MIME-kuvertsammanhang."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Spara bilaga"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunde inte skapa temporärt meddelandefält \"%s\": %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Spara till disk..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Spara bilaga"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Visa inuti"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visa inuti (med %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Dölj"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Externt visningsprogram"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Läs in _bilder"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Läser in meddelandeinnehåll"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Objekt som skulle ha utförts:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %H.%M"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Spara länk som (FIXME)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Felaktig adress"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Från"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Svara till"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Till"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Kopia"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Blindkopia"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "E-post"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Spara meddelande som..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Detta meddelande är digitalt signerat. Klicka på låsikonen för mer "
 "information."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Kunde inte skapa ett PGP-verifieringssammanhang."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Detta meddelande är digitalt signerat men äktheten kan inte bevisas."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pekare till fjärrdata (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okänd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Lokala mappar"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Kan inte spara metainformation; du kommer antagligen att\n"
 "upptäcka att du inte kan öppna denna mapp längre: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan inte spara metainformation för mapp på %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan inte ta bort metainformation för mapp %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Byter format på mappen \"%s\" till \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s kan inte konfigureras om eftersom den inte är en lokal mapp"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12750,16 +12982,16 @@ msgstr ""
 "Om du inte längre kan öppna denna brevlåda måste\n"
 "du kanske reparera den manuellt."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan inte ändra formatet på en ickelokal mapp."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurera om /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12768,7 +13000,7 @@ msgstr ""
 "Fel vid \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12777,7 +13009,7 @@ msgstr ""
 "Fel vid utförande av åtgärd:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Arbetar"
 
@@ -12785,100 +13017,100 @@ msgstr "Arbetar"
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Meddelandet skickades dock utan problem."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Meddelande %d av %d misslyckades"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12887,7 +13119,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12896,11 +13128,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12909,27 +13141,22 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "Kör skalkommando: %s"
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Sök"
 
@@ -12984,32 +13211,41 @@ msgstr "Sökväg: %s, typ: %s"
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Skicka och ta emot e-post"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Avbryt allt"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Kom ihåg detta lösenord"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Kom ihåg detta lösenord för resten av denna session"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
@@ -13039,7 +13275,7 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till dessa servrar, "
 "till exempel: \"Jobb\" eller \"Hemma\"."
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Namn:"
 
@@ -13069,7 +13305,7 @@ msgstr "Vidarebefordrat meddelande - %s"
 msgid "Forwarded message"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Vidarebefordrat meddelande"
 
@@ -13083,7 +13319,7 @@ msgstr "Ställer in virtuell mapp: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13096,94 +13332,97 @@ msgstr ""
 "    \"%s\"\n"
 "och har uppdaterats."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, 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:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Inget ämne)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Meddelande"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %H.%M"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -13218,47 +13457,47 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Källinformation"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svara till alla"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Förhandsgranska"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13282,16 +13521,16 @@ msgstr "Prenumererar på mappen \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Säger upp prenumeration på mappen \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mapp"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Välj en server."
 
@@ -17755,11 +17994,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro-flygplatsen"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23175,8 +23416,8 @@ msgstr "Ingen beskrivning"
 msgid "Mail summary"
 msgstr "E-postsammanfattning"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
@@ -23194,17 +23435,17 @@ msgstr "ESGG:ESMS:ESSA:ESNU"
 msgid "Dictionary.com Word of the Day"
 msgstr "Dagens ord från dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Dagens citat"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Lägg till en nyhetskälla"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Ange URL:en till den nyhetskälla som du vill lägga till"
 
@@ -23216,26 +23457,26 @@ msgstr "Fel vid hämtning av RDF"
 msgid "News Feed"
 msgstr "Nyhetskälla"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Lägg till"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Visa"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Inga uppgifter"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Ingen beskrivning)"
 
@@ -24510,7 +24751,8 @@ msgid "Tasks "
 msgstr "Uppgifter "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Väderinställningar"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24570,7 +24812,7 @@ msgstr "Visa detaljer"
 msgid "Cancel Operation"
 msgstr "Avbryt åtgärd"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24584,20 +24826,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Lägg till regel för virtuell mapp"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Utkast"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Skickat"
 
@@ -24836,22 +25078,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Skapa ny mapp"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"Den markerade typen av mapp är inte giltig för\n"
-"den begärda åtgärden."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Skapa _ny mapp..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Ny..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Namnlös)"
 
@@ -24873,7 +25108,7 @@ msgstr ""
 "Du kan välja \"Automatisk\" om du inte vet, så kommer Evolution att försöka "
 "reda ut det."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Välj den information som du vill importera:"
 
@@ -24904,21 +25139,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Du kan endast importera till lokala mappar"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24927,11 +25158,11 @@ msgstr ""
 "Det finns ingen importör som kan hantera\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Importerar"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24940,17 +25171,17 @@ msgstr ""
 "Importerar %s.\n"
 "Startar %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Fel vid start av %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Fel vid inläsning av %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24959,31 +25190,31 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24991,24 +25222,24 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Välj en destinationsmapp för importen av denna data"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Importera"
 
@@ -25054,9 +25285,14 @@ msgstr "Öppnar mappen %s"
 msgid "in \"%s\" ..."
 msgstr "Öppna i %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Kunde inte byta namn på mapp: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Kan inte skapa den angivna katalogen:\n"
 "%s"
@@ -25074,8 +25310,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Kunde inte starta gränssnittet för Evolution-epostguiden\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Ny"
@@ -25116,58 +25352,59 @@ msgstr "Gå till mapp..."
 msgid "Select the folder that you want to open"
 msgstr "Markera den mapp som du vill öppna"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Skapa en ny genväg"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Välj den mapp som du vill att genvägen ska peka till:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Ingen mapp visas)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution är just nu ansluten. Klicka på denna knapp för att koppla "
 "från."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution håller på att koppla från."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25179,12 +25416,12 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan inte lägga upp lokal plats för sparande -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25195,31 +25432,31 @@ msgstr ""
 "oväntat avslutats. Du måste avsluta Evolution och starta om det\n"
 "för att komma åt den datan igen."
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Allmänt fel"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25228,107 +25465,117 @@ msgstr ""
 "Vill du verkligen ta bort gruppen\n"
 "\"%s\" från genvägsraden?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Ta inte bort"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Byt namn på genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Byt namn på den markerade genvägsgruppen till:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Visa genvägarna som små ikoner"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "S_tora ikoner"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Visa genvägarna som stora ikoner"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Ny grupp..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "_Ta bort denna grupp..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Ta bort denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Byt namn på denna grupp..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Byt namn på denna genvägsgrupp"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "_Dölj genvägsraden"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "_Visa genvägsraden"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Skapa en ny genväg"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Skapa en ny genväg"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Byt namn på genväg"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Byt namn på den markerade genvägen till:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Öppna mappen som är länkad till denna genväg"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "_Öppna i nytt fönster"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Byt namn på denna genväg"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Ta bort"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Ta bort denna genväg från genvägsraden"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvägar."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -25337,55 +25584,55 @@ msgstr "Genvägar"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Inga fel"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "En mapp med samma namn finns redan"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Den angivna mapptypen är inte giltig"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "I/O-fel"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Inte tillräckligt med utrymme för att skapa mapp"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Mappen är inte tom"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Den angivna mappen hittades inte"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Funktionen är ännu inte implementerad i detta lager"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Åtgärden stöds inte"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stöds inte i detta lager"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Den angivna mappen kan inte ändras eller tas bort"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan inte göra en mapp till barn av dess undermappar"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Kan inte skapa en mapp med det namnet"
 
@@ -25440,63 +25687,63 @@ msgstr ""
 "Felet från aktiveringssystemet är:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA-fel"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Avbruten"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Ogiltigt argument"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Har redan en ägare"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Ingen ägare"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Hittades inte"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Typen stöds inte"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Schemat stöds inte"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Åtgärden stöds inte"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Existerar"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Ogiltig URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Har undermappar"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Inget utrymme kvar"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Gamla ägaren har dött"
 
@@ -25520,6 +25767,26 @@ msgstr "Värd"
 msgid "The following connections are currently active:"
 msgstr "Följande anslutningar är aktiva för tillfället:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Kalender"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakter: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_E-post"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Uppgifter"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Mappnamn:"
@@ -25532,6 +25799,34 @@ msgstr "Mapptyp:"
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Skapa _ny mapp..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Mappnamn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Servrar"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Användar_namn:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolutions konfigurationsassistent"
@@ -25629,15 +25924,15 @@ msgstr "Fråga mig inte igen"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutar nu..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25671,7 +25966,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -25679,46 +25974,46 @@ msgstr ""
 "Tack\n"
 "Ximian Evolution-teamet\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Fråga mig inte igen"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan inte komma åt Ximian Evolution-skalet."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Använd inte startbild"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Startar import"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Startar intelligenta importörer"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
@@ -25754,114 +26049,108 @@ msgstr "Koiera markeringen"
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Skapa ny kontakt"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Skapa ny kontaktlista"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Ta bort markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Ski_cka kontakten till annan..."
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Klistra in från urklipp"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Förhandsgranskar kontakterna som ska skrivas ut"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Förhands_granska"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Skriv ut markerade kontakter"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Spara markerade kontakter som ett VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Markera allt"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Skicka ett meddelande till de markerade kontakterna."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Skicka markerade kontakter till en annan person."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Stoppa inläsning"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Visa den aktuella kontakten"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Kontaktlista"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Vidarebefordra kontakt..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "_Spara som VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Sök efter kontakter"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Markera allt"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Skicka _meddelande till kontakt..."
@@ -25906,11 +26195,6 @@ msgstr "Månad"
 msgid "Previews the calendar to be printed"
 msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Förhands_granska"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
@@ -25943,7 +26227,7 @@ msgstr "Vecka"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Stäng"
 
@@ -25956,7 +26240,7 @@ msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
@@ -25968,8 +26252,8 @@ msgstr "Förhandsgranska det utskrivna objektet"
 msgid "Print this item"
 msgstr "Skriv ut detta objekt"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Spara"
 
@@ -25994,9 +26278,9 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -26006,7 +26290,7 @@ msgstr "Skriv ut ku_vert..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
@@ -26020,8 +26304,8 @@ msgstr "Skicka _meddelande till kontakt..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Spara"
 
@@ -26118,26 +26402,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Nytt meddelande"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Kopiera meddelandet till en ny mapp"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Visa förhandsgranskningsfönster för meddelanden"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prenumerera eller säg upp prenumeration på mappar på fjärrservrar"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "_Redigerare för virtuella mappar..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filter..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "F_örhandsgranskningspanel"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Prenumerera på mappar..."
 
@@ -26235,7 +26529,7 @@ msgstr "Trådad meddelandelista"
 msgid "_Expunge"
 msgstr "T_öm"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Mapp"
 
@@ -26497,182 +26791,197 @@ msgstr "Föregående olästa meddelande"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Uppgiftssvar"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Kontrollera nya meddelanden i alla mappar"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Föregående viktiga meddelande"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Förhandsgranska meddelandet som ska skrivas ut"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Föregående"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Skriv ut detta meddelande"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Vidarebefordra det markerade meddelandet till någon"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Återställ texten till dess originalstorlek"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "_Sök meddelande..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Mindre"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Spara meddelandet som en textfil"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Sök efter text i meddelandetexten på det visade meddelandet"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Ställ in sidinställningarna för din aktuella skrivare"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Visa e-post_källkod"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Visa fullständiga _huvuden"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Visa meddelanden i normal stil"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Visa meddelande med alla e-posthuvuden"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Visa den råa e-postkällkoden till meddelandet"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Te_xtstorlek"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Ångra borttagning av de markerade meddelandena"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Virtuell mapp på _sändlista..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Virtuell mapp på _avsändare..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Virtuell mapp på _mottagare..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Virtuell mapp på _ämne..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Bifoga"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Vidarebefordra meddelande"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Gå till"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "Inuti"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Större"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Nästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Föregående meddelande"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citerad"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Skicka _om..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "V_erktyg"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "S_täng"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Visa"
 
@@ -26700,169 +27009,161 @@ msgstr "Kryptera detta meddelande med ditt S/MIME-krypteringscertifikat"
 msgid "For_mat"
 msgstr "For_mat"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Infoga text_fil..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Infoga en fil som text i meddelandet"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Infoga textfil..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Öppna"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME-kryptera"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME-signera"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Spara som"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Spara _utkast"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Skicka"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Skicka senar_e"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Skicka senar_e"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Skicka meddelandet senare"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Skicka detta meddelande nu"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Visa/dölj bilaga"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "_Visa bilagor"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Signera detta meddelande med ditt S/MIME-signaturcertifikat"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Växla om blindkopiefältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Växla om kopiefältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Växla om frånväljaren ska visas"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Växla om svara till-fältet ska visas"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Bilaga..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Blindkopiefältet"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Kopiefältet"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Ta bort alla"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Frånfältet"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Svara till-fältet"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Spara objektet och stäng dialogrutan"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Hjälp"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Signaturfil"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Lägg till mapp till din lista över prenumererade mappar"
@@ -26958,171 +27259,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Lägg till i _genvägsraden"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Inställningar för Mitt Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Ändra namnet på denna mapp"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Kopiera denna mapp"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Skapa _ny mapp..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Skapa en länk till denna mapp i genvägsraden"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Skapa en ny mapp"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Skapa en ny genväg"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Skapa en ny mapp"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Ta bort denna mapp"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Visa en annan mapp"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Evolutionfönster"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Avsluta programmet"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Importera data från andra program"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Flytta denna mapp till ett annat ställe"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Skapa _ny mapp..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Öppna i nytt fönster"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Öppna denna mapp i ett annat fönster"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "_Pilotinställningar..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagd e-post och hämta ny e-post"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "E-postkonfiguration"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Växla"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Växla om mappraden ska visas"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Växla om genvägsraden ska visas"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Visa den markerade mappen"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Frågor och _svar om Ximian Evolution"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Om Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopiera..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Mapprad"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Mapp"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "_Gå till mapp..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Flytta..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Ny mapp"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilotinställningar..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "Inställningar för uppgifter..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "_Byt namn..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Genväg"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Genvägsrad"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Genväg"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Skriv ut sammanfattning"
@@ -27136,17 +27468,40 @@ msgid "Reload the view"
 msgstr "Läs om vyn"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adresskort"
+#, fuzzy
+msgid "By _Company"
+msgstr "Efter företag"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Efter företag"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adresskort"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefonlista"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Veckovy"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Dagsvy"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Månadsvy"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Arbetsveckovy"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27172,13 +27527,19 @@ msgstr "Efter ämne"
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Med kategori"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Uppgift"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27332,11 +27693,11 @@ msgstr "Teckenkodning"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Sökredigerare"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Spara sökning"
 
@@ -27376,21 +27737,21 @@ msgstr "Meddelande"
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Sök nu"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Töm"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Sök nu"
 
@@ -27404,18 +27765,171 @@ msgstr "Server för personlig adressbok"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Server för personlig kalender; kalenderfabrik"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): kunde inte initiera GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): kunde inte initiera GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): kunde inte initiera Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution kan inte få tag i det lokala adressbokslagret.\n"
+#~ "Detta kan ha orsakats av att komponenten evolution-addressbook kraschar.\n"
+#~ "För att hjälpa oss att bättre förstå och lösa detta problem en gång för\n"
+#~ "alla kan du skicka ett brev till Jon Trowbridge <trow@ximian.com> med en\n"
+#~ "detaljerad beskrivning av de omständigheter under vilket felet "
+#~ "framträdde.\n"
+#~ "Tack på förhand."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution kan inte få tag på det lokala adressbokslagret.\n"
+#~ "Normalt bör detta aldrig inträffa. Du kan behöva avsluta\n"
+#~ "och starta om Evolution för att åtgärda detta problem."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Flytta..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Mötestatusen har ändrats. Skicka en uppdaterad version?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Ta bort detta möte"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Utställare: %s\n"
+#~ "Ämne: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL-protokollfel"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "I/O-fel: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Fel på välkomstsvar: %s: möjligtvis inte ödesdigert"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO-begäran gjorde time-out: %s: inte ödesdigert"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Fel i HELO-svar: %s: inte ödesdigert"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT-begäran gjorde time-out: %s: inte ödesdigert"
+
+#~ msgid "Insert File"
+#~ msgstr "Infoga fil"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Du har valt ett ogiltigt datum."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Meddelandedatumet kommer att jämföras med\n"
+#~ "den tid då filtret körs eller en virtuell\n"
+#~ "mapp öppnas."
+
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "Företag"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolutions diskussionsgruppsredigerare"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Är du säker på att du vill ta bort detta diskussionsgruppskonto?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Du måste konfigurera ett konto innan du kan skicka brevet."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP-server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "Redigera diskussionsgruppsserver"
+
+#~ msgid "Source"
+#~ msgstr "Källkod"
+
+#~ msgid "Source Information"
+#~ msgstr "Källinformation"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Spara till disk..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Spara meddelande som..."
+
+#~ msgid "Executing shell command: %s"
+#~ msgstr "Kör skalkommando: %s"
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Skapa ny mapp"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "Den markerade typen av mapp är inte giltig för\n"
+#~ "den begärda åtgärden."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Du kan endast importera till lokala mappar"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Kontaktlista"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Infoga text_fil..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Infoga en fil som text i meddelandet"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Infoga textfil..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Skicka senar_e"
+
+#~ msgid "Send _later"
+#~ msgstr "Skicka senar_e"
+
+#~ msgid "Send the message later"
+#~ msgstr "Skicka meddelandet senare"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilotinställningar..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adressbokskällor"
@@ -27578,10 +28092,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "Signaturfil:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "Ta bort allt utom signatur"
 
@@ -28010,9 +28520,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Organisation:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Kom ihåg detta lösenord"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Skicka brev i HTML-format som standard."
 
@@ -28316,12 +28823,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Email contains"
 #~ msgstr "E-postadressen innehåller"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Skapa ett nytt möte"
-
-#~ msgid "Create a new task"
-#~ msgstr "Skapa en ny uppgift"
-
 #~ msgid "New _Task"
 #~ msgstr "Ny _uppgift"
 
@@ -28359,9 +28860,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "Det här kommer att ansluta till POP-servern och använda Kerberos 4 för "
 #~ "att autentisera med den."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Kunde inte autentisera till KPOP-server: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Kunde inte ansluta till server: %s"
 
@@ -28392,9 +28890,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "E-postlagringsmapp (intern)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Kunde inte ansluta till lager: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Nytt e-_postmeddelande"
 
@@ -28491,9 +28986,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Skapa eller redigera e-postkonton och andra inställningar"
 
-#~ msgid "New Message"
-#~ msgstr "Nytt meddelande"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "_E-postinställningar..."
 
@@ -29189,9 +29681,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Using the _Mailer"
 #~ msgstr "Använda _e-postdelen"
 
-#~ msgid "R_esend..."
-#~ msgstr "Skicka _om..."
-
 #~ msgid "_Re-send Message"
 #~ msgstr "Skicka _om meddelande"
 
@@ -29421,9 +29910,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Print message to the printer"
 #~ msgstr "Skriv ut meddelandet på skrivaren"
 
-#~ msgid "Tasks Preferences..."
-#~ msgstr "Inställningar för uppgifter..."
-
 #~ msgid "_Insert text file..."
 #~ msgstr "_Infoga textfil..."
 
@@ -29913,9 +30399,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Search \"%s\""
 #~ msgstr "Sök i \"%s\""
 
-#~ msgid "Copy message to a new folder"
-#~ msgstr "Kopiera meddelandet till en ny mapp"
-
 #~ msgid "Display all of the message headers"
 #~ msgstr "Visa alla meddelandehuvuden"
 
@@ -30298,9 +30781,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "Outgoing Mail Server"
 #~ msgstr "Server för utgående post"
 
-#~ msgid "Servers"
-#~ msgstr "Servrar"
-
 #~ msgid "Registering local folder"
 #~ msgstr "Registrerar lokal mapp"
 
@@ -30381,9 +30861,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ msgid "_Open in New Window"
 #~ msgstr "_Öppna i nytt fönster"
 
-#~ msgid "_Print Message"
-#~ msgstr "Skriv _ut meddelande"
-
 #~ msgid "_VFolder on Subject"
 #~ msgstr "_Virtuell mapp på ämne"
 
@@ -30489,9 +30966,6 @@ msgstr "init_bonobo(): kunde inte initiera Bonobo"
 #~ "För läsning av e-post som levereras av det lokala systemet och som lagras "
 #~ "på lokal disk."
 
-#~ msgid "Create a new note"
-#~ msgstr "Skapa en ny anteckning"
-
 #~ msgid "<b>Error loading calendar:<br>Calendar in use."
 #~ msgstr "<b>Fel vid inläsning av kalender:<br>Kalendern upptagen."
 
diff --git a/po/tr.po b/po/tr.po
index 2dc583b648..2aa8b9f460 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-23 16:44+0000\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
@@ -37,7 +37,7 @@ msgstr "VCard dosyalarını Evolution'a aktarır."
 msgid "File As"
 msgstr "Farklı Dosyala"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "İsim"
@@ -345,46 +345,46 @@ msgstr "%s için VCard"
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Aranıyor..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Arama ifadesinde hata."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "LDAP sunucuya kart ekleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "LDAP sunucudaki kart siliniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "LDAP sunucudaki kart düzenleniyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Arama yeniden başlatılıyor."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "LDAP arama sonuçları alınıyor..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "URL açılamadı: %s"
@@ -475,11 +475,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Bağlantılar"
 
@@ -495,22 +495,31 @@ msgstr "LDAP Sunucusu"
 msgid "LDAP server containing contact information"
 msgstr "Bağlantı bilgisini içeren LDAP sunucusu"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Yeni Bağlantı"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Bağlantı"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Yeni bir bağlantı yarat"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Yeni Bağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "B_ağlantı Listesi"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Yeni Bağlantı"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Bağlantı"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Yeni bir bağlantı listesi yarat"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -533,30 +542,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Gnome-vfs başlatılamıyor"
 
@@ -564,11 +573,11 @@ msgstr "Gnome-vfs başlatılamıyor"
 msgid "Other Contacts"
 msgstr "Diğer Bağlantılar"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Adres defterini açamadım"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -577,7 +586,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -589,7 +598,7 @@ msgstr ""
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -597,44 +606,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s için parolayı girin (kullanıcı: %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "biter"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "2. E-posta Adresi"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin tarayıcısının göstereceği URI"
 
@@ -755,7 +764,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Adres Defteri Kaynakları"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -821,7 +830,8 @@ msgid "Evolution will use this DN to authenticate you with the server"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:31
-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 ""
 
 #: addressbook/gui/component/ldap-config.glade.h:32
@@ -848,8 +858,8 @@ msgstr "Yapılandırma"
 msgid "Mappings"
 msgstr "Marjin"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_her"
@@ -903,8 +913,8 @@ msgstr "Arama _sahası:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Arıyor"
 
@@ -1091,15 +1101,15 @@ msgid "Using email address"
 msgstr "E-posta adresi"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Ekle"
 
@@ -1145,12 +1155,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Düzenle"
@@ -1261,10 +1271,10 @@ msgstr "Adres defteri isim seçim arayüzü mimarisi"
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Sil"
 
@@ -1293,33 +1303,15 @@ msgstr "(%d adet gösterilmiyor)"
 msgid "Unnamed Contact"
 msgstr "İsimsiz Bağlantı"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Adres Defterinden Bağlantıları Seç"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Gönderen içerir"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Adres Defterinden Bağlantıları Seç"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "İsimleri Seçin"
@@ -1339,14 +1331,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Browse..."
-msgstr "_Gözat..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_Dizin:"
 
@@ -1450,11 +1438,12 @@ msgstr "_HTML e-postalarını kabul ediyor"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -2688,7 +2677,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Sil"
 
@@ -2751,7 +2740,7 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
@@ -2779,21 +2768,21 @@ msgid "Error getting book view"
 msgstr "%s başlatırken hata oluştu"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Kartlar düzenlenirken bir hata oluştu"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Başarıldı"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -2801,8 +2790,8 @@ msgstr "Bilinmeyen hata"
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "İzin yok"
 
@@ -2819,7 +2808,7 @@ msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2842,46 +2831,51 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "%s dosyası bulunamadı."
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Liste eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Kart eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Kartı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "Kartlar Gösterilsin mi?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "Kart Gösterimi"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2889,22 +2883,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Kart yok"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 msgid "Copy cards to"
 msgstr "Kartları buraya kopyala"
 
@@ -2976,7 +2970,7 @@ msgstr "Adres Defteri"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
@@ -3009,7 +3003,7 @@ msgid "Pilot Settings..."
 msgstr "Pilot Ayarları..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
@@ -3018,8 +3012,8 @@ msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Yazdır"
@@ -3037,7 +3031,7 @@ msgid "Move to folder..."
 msgstr "Dizine Taşı..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
@@ -3048,20 +3042,20 @@ msgid "Copy"
 msgstr "Kopyala"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Sil"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
@@ -3228,7 +3222,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -3318,26 +3312,26 @@ msgstr "Başlıksız toplantı"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Yüksek"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Düşük"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Tanımsız"
@@ -3461,11 +3455,11 @@ msgstr "Dinlenme zamanı (dakika)"
 msgid "_Edit appointment"
 msgstr "_Toplantıyı düzenle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Açıklama yok."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3473,13 +3467,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Uyarı"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3490,7 +3484,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "Bu program hakkında tekrar soru sorma."
 
@@ -3518,7 +3512,7 @@ msgstr "Açıklama içeriği"
 msgid "Comment contains"
 msgstr "Yorum içeriği"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
@@ -3529,7 +3523,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%d %b %a"
 
@@ -3551,16 +3545,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
-msgid "Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-commands.c:797
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Özel"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Gizli"
@@ -3585,37 +3580,37 @@ msgstr "D"
 msgid "W"
 msgstr "B"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Boş"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Meşgul"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Başlamadı"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "İşlemde"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3626,56 +3621,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Tekrarlama"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Görevlendirildi"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Evet"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Hayır"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Gün Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Çalışma Haftası Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Hafta Görünümü"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Ay Görünümü"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -3683,12 +3677,12 @@ msgstr "Takvim"
 msgid "Folder containing appointments and events"
 msgstr "Randevuları tutan dizin"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Görevler"
 
@@ -3696,39 +3690,56 @@ msgstr "Görevler"
 msgid "Folder containing to-do items"
 msgstr "Yapılacaklar listesini tutan dizin"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+msgid "New appointment"
+msgstr "Y_eni randevu"
+
+#: calendar/gui/component-factory.c:708
+msgid "_Appointment"
+msgstr "_Randevu"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Yeni bir randevu oluştur"
+
+#: calendar/gui/component-factory.c:713
 msgid "New meeting"
 msgstr "_Yeni toplantı"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 msgid "_Meeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+msgid "Create a new meeting request"
+msgstr "Yeni bir toplantı isteği oluştur"
+
+#: calendar/gui/component-factory.c:718
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Yeni bir görev oluştur"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Y_eni randevu"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Randevu"
 
-#: calendar/gui/component-factory.c:716
-msgid "New appointment"
-msgstr "Y_eni randevu"
-
-#: calendar/gui/component-factory.c:716
-msgid "_Appointment"
-msgstr "_Randevu"
+#: calendar/gui/component-factory.c:724
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Yeni bir randevu oluştur"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3794,7 +3805,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Bu argümanlarla:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "gün"
 
@@ -3802,11 +3814,13 @@ msgstr "gün"
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "dakika"
 
@@ -3934,7 +3948,7 @@ msgstr "Hatırlatıcılar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -3963,7 +3977,7 @@ msgstr "randevu sonu"
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -4139,7 +4153,7 @@ msgid "_Fri"
 msgstr "_Cum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Genel"
 
@@ -4182,21 +4196,35 @@ msgstr "Ç_ar"
 msgid "before every appointment"
 msgstr " randevunun başlangıcından önce"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 #, fuzzy
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
@@ -4265,59 +4293,60 @@ msgstr ""
 msgid "Due "
 msgstr "Tarihe göre "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Dosyalar düzgün bir şekilde güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 msgid "Could not update object"
 msgstr "Nesne güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
-msgid "Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
+msgid ""
+"Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -4519,7 +4548,7 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4532,7 +4561,7 @@ msgstr "Görevler"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
@@ -4617,7 +4646,7 @@ msgstr "tarih"
 msgid "first"
 msgstr "birinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "ikinci"
 
@@ -4637,7 +4666,7 @@ msgstr "sonuncu"
 msgid "Other Date"
 msgstr "Diğer Tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "gün"
 
@@ -4735,20 +4764,26 @@ msgstr "Biten %"
 msgid "Date Completed:"
 msgstr "Tamamlama Tarihi:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "İşlem Gerektiriyor"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "İşlem"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "Ö_ncelik:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Durum:"
 
@@ -4762,7 +4797,7 @@ msgstr "Temel"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4831,78 +4866,78 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Seçili bağlantıları sil"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 msgid "_Save as..."
 msgstr "_Farklı kaydet..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Yazdır..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 msgid "_Assign Task"
 msgstr "_Görev Ata"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 msgid "_Forward as iCalendar"
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Görevleri Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "_Görev eklemek buraya tıklayın"
@@ -4911,8 +4946,8 @@ msgstr "_Görev eklemek buraya tıklayın"
 msgid "Alarms"
 msgstr "Uyarılar"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Tamamlandı"
 
@@ -4940,11 +4975,9 @@ msgstr "Öncelik"
 msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Özet"
 
@@ -4986,108 +5019,107 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "öö"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "ös"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Yeni _Randevu"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "_Yeni toplantı"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Yazdır..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 msgid "_Configure..."
 msgstr "_Yapılandır..."
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 msgid "_Configure Pilot..."
 msgstr "Pilot'u Yapılandır..."
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Toplantı Zamanı Düzenle"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Bu _Oluşumu Taşınabilir Yap"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "%s çalıştırırken bir hata oldu."
@@ -5131,7 +5163,7 @@ msgstr "Tamamlanan Görev: <b>"
 msgid "Task Due: <b>"
 msgstr "Görev başlangıcı: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
@@ -5140,12 +5172,12 @@ msgstr "iCalendar Bilgisi"
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5153,322 +5185,327 @@ msgstr ""
 "<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
 "bir işlem seçiniz."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "_Konum: "
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Durum:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Tamam"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Girişimli"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> bir toplantıyı iptal etti."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Toplantı İptali"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı Mesajı"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> görev bilgisi yayınladı."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> bir görev tanımına cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> bir görevi iptal etti."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Hatalı Görev Mesajı"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul Mesajı"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dizin onarılamayacak şekilde bozulmuş."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Takvim dosyası güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Dizini Seçin"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Dizini Seçin"
@@ -5514,7 +5551,7 @@ msgstr "başlangıç-tarihi"
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Gerekli Katılımcılar"
 
@@ -5527,58 +5564,53 @@ msgid "Non-Participants"
 msgstr "Katılmayanlar"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Bireysel"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Grup"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Kaynak"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Oda"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 #, fuzzy
 msgid "Chair"
 msgstr "Araba"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Gerekli Katılımcı"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Seçimlik Katılımcı"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Katılmayan"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "İşlem Gerektiriyor"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Girişimli"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 #, fuzzy
 msgid "Delegated"
 msgstr "Silinen"
@@ -5669,47 +5701,44 @@ msgstr "Toplantı b_aşlama saati :"
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "%s içindeki görevler yüklenemedi."
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "`%s' dizini açılamadı."
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Seçili bağlantıları sil"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Bu Randevuyu Sil"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5720,11 +5749,16 @@ msgstr "`%s' dizini açılamadı."
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s' açmak için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s tarihinde takvim açılıyor"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "%s dizini açılıyor"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -5781,52 +5815,57 @@ msgstr "Ekim"
 msgid "September"
 msgstr "Eylül"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "En az bir katılımcı olmak zorunda"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Olay bilgisi"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Görev bilgisi"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "Seçimlik Bilgiler"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Boş/Meşgul bilgisi"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Takvim bilgisi"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Tazele"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Bu olayda bir katılımcı olarak görünmeniz gerekiyor."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Bonobo'yu başlatamadım"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "Bileşen düzenleyici mimarisi oluşturulamadı."
 
@@ -6053,9 +6092,8 @@ msgid "Print Calendar"
 msgstr "Takvimi Yazdır"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Önizlemeyi Yazdır"
 
@@ -6069,7 +6107,8 @@ msgstr "Yazdırma Ayarları"
 
 #: calendar/gui/tasks-control-factory.c:75
 #, fuzzy
-msgid "Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
 msgstr "Takvim görünümü yaratılamadı. ORBit ve OAF kurulumunu gözden geçirin."
 
 #: calendar/gui/tasks-control.c:147
@@ -6084,8 +6123,8 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
@@ -6098,7 +6137,8 @@ msgstr "Kartları yazdır"
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
 "automatically migrated them to the new tasks folder."
-msgstr "Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
+msgstr ""
+"Evolution takvim dizininde bulunan tüm görevleri görevler dizinine aktardı."
 
 #: calendar/gui/tasks-migrate.c:108
 msgid ""
@@ -6144,15 +6184,27 @@ msgstr "iCalendar dosyalarını Evolution'a aktarır"
 msgid "Imports vCalendar files into Evolution"
 msgstr "iCalendar dosyalarını Evolution'a aktarır"
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Sunucuya bağlantı kurulamadı: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 msgid "Reminder!!"
 msgstr "Hatırlatıcı!!"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 msgid "Calendar Events"
 msgstr "Takvim OIayları"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6161,121 +6213,121 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Takvim"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time 1 argüman istiyor"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time için birinci argüman bir dizi olmalıdır."
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 1. argümanı ISO 8601 tarih/saat bilgisi olmalıdır"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 2 argüman istiyor"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 #, fuzzy
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 2. argümanı bir sayı istiyor"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin bir argüman istiyor"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end bir argüman istiyor"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "ocrur-in-time-range? iki argüman istiyor"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 #, fuzzy
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 #, fuzzy
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "time-day-end birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? iki argüman istiyor"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? ikinci argümanı dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 #, fuzzy
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "contains? birinci argümanı dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 #, fuzzy
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? tüm argümanları dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 #, fuzzy
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr "has-categories? tüm argümanları dizgi şeklinde istiyor"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "time-now hiç argüman istemiyor"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin birinci argümanı time_t biçiminde istiyor"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -7865,71 +7917,81 @@ msgstr "Yeni dizin yaratılıyor"
 msgid "You must be working online to complete this operation"
 msgstr "Bu işlemi bitirmek için İnternet bağlantısı sağlamalısınız"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Mesajın alınmasında hata"
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Geçersiz argümanlar"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Geçersiz argümanlar"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
@@ -7985,7 +8047,7 @@ msgstr "Mesajlar taşınıyor"
 msgid "Copying messages"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -7993,46 +8055,46 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Dosya adı belirtilmedi."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8040,18 +8102,18 @@ msgid ""
 "%.*s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Mesajın açılmasında hata."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Bu mesaj denetlenemedi: %s geçici dosyası yaratılamadı"
@@ -8077,24 +8139,24 @@ msgid "Could not lock '%s'"
 msgstr "%s kilitlenemedi"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "%s için kilitleme dosyası oluşturulamadı: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "%s dosyasının kilidinin açılmasını beklerken zaman aşımı. Daha sonra yeniden "
 "deneyiniz."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "fcntl(2) kullanılırken kilitleme hatası: %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullanılırken kilitleme hatası: %s"
@@ -8153,11 +8215,16 @@ msgstr "Geçici mektup dosyasına yazarken hata: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Geçici mektup dosyasına yazarken hata: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "Şifre açılamadı: Bilinmeyen hata"
+
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Şifre açılamadı: Bilinmeyen hata"
@@ -8242,7 +8309,8 @@ msgstr "DIGEST-MD5"
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
-msgstr "Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
+msgstr ""
+"Bu seçenek sunucuya güvenli DIGEST-MD5 sistemi ile bağlantı kuracaktır. "
 
 #: camel/camel-sasl-digest-md5.c:810
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8286,7 +8354,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -8323,7 +8391,8 @@ msgstr "SMTP öncesi POP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
+msgstr ""
+"Bu özellik, SMTP bağlantısı yaratmadan önce bir POP bağlantısı kuracaktır"
 
 #: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
@@ -8458,33 +8527,134 @@ msgstr "Dizin alınamadı: Gerçersiz"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"Gönderen: %s\n"
-"Konu: %s"
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "İmza dosyası:"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "%s yüklenirken hata oluştu"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Ofiste Değil"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Sertifika denetlenemedi."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Geçersiz argüman"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "_Sertifika No:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
 msgstr ""
-"%s adresinden hatalı bir sertifika alındı:\n"
-"\n"
-"%s\n"
-"\n"
-"Yine de kabul etmek istiyor musunuz?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8497,16 +8667,33 @@ msgstr ""
 "Parmak izi:       %s\n"
 "İmza:              %s"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "İYİ"
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "KÖTÜ"
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"%s adresinden hatalı bir sertifika alındı:\n"
+"\n"
+"%s\n"
+"\n"
+"Yine de kabul etmek istiyor musunuz?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8525,32 +8712,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "%s başlatırken hata oluştu"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, 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:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
@@ -8558,12 +8750,12 @@ msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti"
@@ -8592,40 +8784,40 @@ msgstr "IMAP sunucu cevabı %s bilgisini içermiyor"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP sunucudan beklenmeyen cevap: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "%s dizini yaratılamadı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s için özet bilgisi yüklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Değiştirilen iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
@@ -8634,10 +8826,10 @@ msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 msgid "Could not open cache directory: %s"
 msgstr "Önbellek dizini yaratılamadı: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
@@ -8650,7 +8842,7 @@ msgstr "Yeni iletiler denetleniyor"
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Dizinler"
 
@@ -8680,7 +8872,7 @@ msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Parola"
 
@@ -8690,73 +8882,77 @@ msgstr ""
 "Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
 "sağlar."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s için %s üzerindeki %s servisi"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Bağlantı iptal edildi"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s adresine bağlantı kurulamadı (%d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "İşlem desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Kimlik denetimi başarısız."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Dizin boş değil"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, 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:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sınama yöntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8767,31 +8963,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, 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:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "%s posta kutusu açılamadı: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8813,7 +9015,9 @@ msgid "Local delivery"
 msgstr "Yerel aktarım"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8841,12 +9045,12 @@ msgstr "Standart UNIX posta kutusu kuyruğu"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "İletileri Unix spool dizinleri halinde saklamak için"
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8857,38 +9061,38 @@ msgstr "%s saklama dizininde hata"
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "Yerel disklerde gelen dizini bulunmasın"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "`%s' dizin indeks dosyası silinemedi: %s"
@@ -8948,7 +9152,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -8986,26 +9190,26 @@ msgstr "maildir dizini değil"
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamadı: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Maildir dizini açılamadı: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Yeni iletiler denetleniyor"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Yeni iletiler taranıyor"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -9050,7 +9254,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9059,7 +9263,7 @@ msgstr ""
 "`%s' dosyası açılamadı:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9068,14 +9272,14 @@ msgstr ""
 "`%s' dosyası yaratılamadı:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' normal bir dosya değildir."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9084,7 +9288,7 @@ msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini boş değil. Silinmedi."
@@ -9099,64 +9303,64 @@ msgstr "Dizin açılamadı: `%s': %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "%s dosyası açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Geçici posta kutusu açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kaynak dizin %s açılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Özet ve dizin uyuşmazlığı"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Dizinin adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Geçici posta kutusuna yazma hatası: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Geçici dosya kutusuna yazma işlemi başarısız: %s: %s"
@@ -9306,48 +9510,48 @@ msgstr "İptal"
 msgid "Operation failed: %s"
 msgstr "İşlem başarısız oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "POP özeti alınıyor"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "İşlem iptal edildi"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "POP özeti alınamadı: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Seçili iletileri kes"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "%s kullanıcı numarasıyla ileti yok"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d. POP iletisi alınıyor"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "İleti alınamadı: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "Bilinmeyen neden"
 
@@ -9364,7 +9568,7 @@ msgstr "İletileri sunucuda bırak"
 msgid "Delete after %s day(s)"
 msgstr "%s günden sonra sil"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9386,7 +9590,13 @@ msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
-msgstr "Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
+msgstr ""
+"Bu seçenek POP sunucuya şifreli APOP protokolünü kullanarak bağlantı kurar."
+
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "%s adresine bağlantı kurulamadı (%d): %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
@@ -9399,54 +9609,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "%s üzerindeki POP sunucuya bağlantı kurulamadı"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Belirtilen kimlik sınama protokolü desteklenmiyor."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' girişi başarısız: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL Protokol hatası"
-
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "G/Ç hatası: %s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"IMAP sunucuyla kimlik denetimi başarısız oldu\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sLütfen %s@%s için POP3 parolasını girin"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 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:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9470,35 +9685,35 @@ msgstr "sendmail ile bağlantı kurulamadı: %s: ileti gönderilemedi"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "sendmail çalıştırılamadı: %s: ileti gönderilemedi"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "İleti gönderilemedi: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s sinyali ile kapandı: ileti gönderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "%s çalıştırılamadı: ileti gönderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d durumu ile çıktı: ileti gönderilemedi."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9606,45 +9821,45 @@ msgstr "Geçici kimlik denetim hatası"
 msgid "Authentication required"
 msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Giriş hatası: %s: önemsiz"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "QUIT cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Bu iletinin biçimi düzgün değil."
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "%s SMTP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9655,88 +9870,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s üzerinden STMP ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "İleti gönderiliyor"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İleti gönderilemedi: bir ya da daha fazla geçersiz alıcı var"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP Karşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO zaman aşımı: %s: ileti gönderilmedi"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELO cevap hatası: %s: ileti gönderilmedi"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET cevap hatası"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratılamadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH isteği başarısız."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
@@ -9744,86 +9959,86 @@ msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "DATA cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA gönderimi zaman aşımına uğradı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "DATA kesimi cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "RSET cevap hatası"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT isteği zaman aşımına uğradı: %s: önemsiz"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH isteği zaman aşımına uğradı: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "QUIT cevap hatası"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "ek"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili dosyaları ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "İletiyi bir dosya ekle"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "%s dosyası eklenemedi: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "%s dosyası eklenemedi: Normal bir dosya değil."
@@ -9841,56 +10056,60 @@ msgid "MIME type:"
 msgstr "MIME türü:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Adres defteri için buraya tıklayın"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Gönderen:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Cevapla:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Gönderen:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Konu:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Alıcı:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "İletinin gönderildiği kişiler"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Bilgi:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "İletinin kopyasının gönderilecek olunduğu adresler"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Gizli:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9898,17 +10117,25 @@ msgstr ""
 "İletinin karbon kopyalarının gönderileceği adresi girin. Ancak buraya "
 "girilecek kişiler gönderilenler listesinde görünmeyecektir."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "PGP imza dosyası oluşturulamadı."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9917,35 +10144,35 @@ msgstr ""
 "%s dosyasını yüklerken hata oldu:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Uyarı!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "%s dosyasını kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasını yüklerken hata oldu"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Dosyaya erişirken hata oldu: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "%s POP sunucusundan iletileri alamadım: %s"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -9954,7 +10181,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -9963,7 +10190,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -9972,7 +10199,7 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -9981,7 +10208,7 @@ msgstr ""
 "Evolution, Pine e-posta dosyaları buldu.\n"
 "Bunların Evolution'a aktarılmasını istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -9990,47 +10217,43 @@ msgstr ""
 "Bu ileti gönderilmedi.\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Dosya _Ekle"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 msgid "Signature:"
 msgstr "İmza:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 msgid "Set as default"
 msgstr "Öntanımlı kullan"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10039,9 +10262,9 @@ msgstr ""
 "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
 "e-posta bilgilerinizi girmediniz."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10105,8 +10328,8 @@ msgstr "Konu içerir"
 msgid "Subject does not contain"
 msgstr "Konu içermez"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10114,12 +10337,11 @@ msgstr ""
 "Aynı isimde bir dosya zaten var\n"
 "Üzerine yazılsın mı?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Bu parolayı hatırla"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -10217,150 +10439,100 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "yılda bir güncelle"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "yılda bir güncelle"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "saniye"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "ay"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "dakika"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "ay"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "saat"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "hafta"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "saat"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "ay"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "dakika"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "ay"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "saniye"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "yılda bir güncelle"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "yılda bir güncelle"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Bir tarih seçmeyi unuttunuz."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Hatalı tarih seçimi yaptınız."
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<bir tarih seçmek için tıklayınız>"
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Bu iletinin tarihi filtrenin çalıştırıldığı\n"
-"ya da vfolder'ın açıldığı tarih ile\n"
-"karşılaştırılacaktır."
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+msgid "now"
+msgstr "şimdi"
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"İletinin tarihi burada belirttiğiniz\n"
-"tarih ile karşılaştırılacaktır."
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%d %b %a %Y"
 
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, c-format
+msgid "%d %s ago"
 msgstr ""
-"İletinin tarihi filtrenin çalıştırıldığı\n"
-"zamana göreceli bir tarih ile karşılaştırılacaktır,\n"
-"örnek olarak \"bir hafta önce\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "şimdiki zaman"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "belirttiğiniz zaman"
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "şimdiki zamana göreceli bir zaman"
-
-#. The dialog
-#: filter/filter-datespec.c:394
+#: filter/filter-datespec.c:407
 #, fuzzy
 msgid "Select a time to compare against"
 msgstr "Bir dosya seçin"
 
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Karşılaştır"
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "şimdi"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr ""
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr ""
-
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<bir tarih seçmek için tıklayınız>"
-
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filtre Kuralları"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "Stil adı:"
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "`%s' normal bir dosya değildir."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 msgid "Choose a file"
 msgstr "Bir dosya seçin:"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Sonra"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Eylem ekle"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10368,12 +10540,12 @@ msgstr ""
 "Bir dizin seçmeyi unuttunuz.\n"
 "Lütfen geriye gidip geçerli bir dizin seçin."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Dizini Seçin"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10382,92 +10554,164 @@ msgstr ""
 "`%s' düzgün deyiminde hata var:\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Önemli"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+msgid "Work"
+msgstr "İş"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
+msgstr "Kişisel"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+msgid "To Do"
+msgstr "Yapılacaklar"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+msgid "Later"
+msgstr "Sonra"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Bu filtrenin adını değiştirmelisiniz."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Kural adı:"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "İsimsiz"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Eğer"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Eylemleri işlet"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "tüm kriterler sağlanırsa"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 #, fuzzy
 msgid "if any criteria are met"
 msgstr "herhangi bir kriter sağlanırsa"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Sınıf ekle"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "gelen"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "giden"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Karşılaştır"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Filtreleri Düzenle"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "VFolder Düzenle"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Gelen"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Giden"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"İletinin tarihi burada belirttiğiniz\n"
+"tarih ile karşılaştırılacaktır."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"İletinin tarihi filtrenin çalıştırıldığı\n"
+"zamana göreceli bir tarih ile karşılaştırılacaktır,\n"
+"örnek olarak \"bir hafta önce\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"İletinin tarihi burada belirttiğiniz\n"
+"tarih ile karşılaştırılacaktır."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Sanal Dizinler"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "şimdiki zamana göreceli bir zaman"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "sadece belirtilen dizinler"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "şimdiki zaman"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "belirttiğiniz zaman"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "vFolder Kaynakları"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "tüm etkin uzak dizinlerle birlikte"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "tüm yerel dizinlerle birlikte"
 
@@ -10495,41 +10739,42 @@ msgid "Beep"
 msgstr "Boyut"
 
 #: filter/libfilter-i18n.h:7
-msgid "Command"
-msgstr "Komut"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "içerir"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Dizine Kopyala"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarihi"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Gönderilme tarihi"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinen"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "içermez"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "sonlanmaz"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "bulunmaz"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bulunmaz"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "benzemez"
@@ -10551,93 +10796,89 @@ msgid "ends with"
 msgstr "biter"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "Kabuk Programı Çalıştır"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "bulunur"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Deyim"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Önemli"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "daha önce"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "daha sonra"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "büyük"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "küçük"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "değil"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "İşaretli"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Çağrı Cihazı"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "E-posta listesi"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "İleti Gövdesi"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "İleti Başlığı"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Dizine Taşı"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Kabuk Programı Çalıştır"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Ses çal:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Oku"
 
@@ -10653,57 +10894,87 @@ msgstr "Düzgün Deyim Eşleşimi"
 msgid "Replied to"
 msgstr "Cevaplanan"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "büyük"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "küçük"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puan"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Gönderen"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Durum belirt"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Kabuk Programı Çalıştır"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Boyut (Kb)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "benzer"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Kaynak Hesap"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Özel başlık"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "başlayan"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Konu"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Durum belirt"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Görevler"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Görev Ekle"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Görev Düzenle"
 
@@ -10711,11 +10982,11 @@ msgstr "Görev Düzenle"
 msgid "Score Rules"
 msgstr "Puan Kuralları"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Bu vfolder adını değiştirmelisiniz."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr ""
 
@@ -10724,17 +10995,17 @@ msgstr ""
 msgid "Evolution is importing your old Elm mail"
 msgstr "E-posta alma va gönderme için Evolution bileşeni"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Alınıyor..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Lütfen bekleyiniz"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, fuzzy, c-format
 msgid "Importing %s as %s"
@@ -10742,15 +11013,15 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "%s taranıyor"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "İleti"
 
@@ -10811,39 +11082,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Çöp"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Yerel mektup dosyası %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Dizin taranıyor"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Aktarma işlemi başlıyor"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Filtreleri Düzenle"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10924,12 +11195,12 @@ msgstr "E-posta özet bileşen mimarisi"
 msgid "Font Preferences"
 msgstr "_Tekrarlama yok"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Hesaplar"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -10977,64 +11248,84 @@ msgstr "Özellikler..."
 msgid "Change this folder's properties"
 msgstr "Bu dizinin özelliklerini değiştir"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Posta iletim yöntemi düzenlenmemiş"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Uyarı: İleti Değiştirildi"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Bir ileti yaz"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Yeni İ_leti"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Önceki İ_leti"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Yeni İleti"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'ın posta programı başlatılamadı."
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Evolution'ın ileti yapılandırma bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Evolution'ın ileti dizin bilgi bileşeni başlatılamadı."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Depo kabuğa kayıt ettirilemedi"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" özellikleri"
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Özellikler"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Geçici dizin yaratılamadı: %s"
@@ -11084,135 +11375,135 @@ msgstr "toplam %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "İletiden _Sanal Dizin Yarat"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listelerine Göre Filtrele"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "_Tümüne Cevapla"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Temizle"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Filtreleri Uygula"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "İletiden Bir Kural Yarat"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "E-posta Listesi Üzerinde VFolder"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "E-posta Listesine Filtre (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "E-posta Listesi Üzerinde VFolder (%s)"
@@ -11276,74 +11567,65 @@ msgstr "pkutusu"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution Haber Grubu Düzenleyici"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "_Yol:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Silme"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Gerçekten hesap silinsin mi?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Kapat"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Etkinleştir"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Etkin"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Hesap adı:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokol"
 
@@ -11352,30 +11634,30 @@ msgstr "Protokol"
 msgid "Mail to %s"
 msgstr "%s adresine postala"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Konu: %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "%s'ten E-posta"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11383,7 +11665,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11395,7 +11677,7 @@ msgstr ""
 "önce yapmanız gerekiyor.\n"
 "Şimdi yapılandırmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11403,7 +11685,7 @@ msgstr ""
 "İleti göndermeden önce kendinize\n"
 "ait bir kimlik oluşturmalısınız."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11412,7 +11694,7 @@ msgstr ""
 "iletim ayarı yapmalısınız."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11420,11 +11702,11 @@ msgstr ""
 "HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
 "biçimli iletiler almak istemiyorlar:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11432,17 +11714,17 @@ msgstr ""
 "Bu iletinin konusu yok.\n"
 "Yine de gönderilsin mi?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Bu ileti sadece gizli (Bcc) alıcıları içeriyor."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11452,15 +11734,11 @@ msgstr ""
 "getirebilir.\n"
 "Yine de göndereyim mi?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Bu e-postayı göndermek için alıcısını belirtmeniz gereklidir."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Bu e-postayı göndermeden önce bir hesap ayarı yapmalısınız."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11468,28 +11746,28 @@ msgstr ""
 "Bu hesap için taslak dizini açılamadı.\n"
 "Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "İletileri buraya taşı"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "İleti(leri) buraya kopyala"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Gerçekten %d iletiyi düzenlemek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11497,7 +11775,7 @@ msgstr ""
 "Sadece taslaklar dizinine kaydedilen\n"
 "iletileri düzenleyebilirsiniz."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11505,39 +11783,39 @@ msgstr ""
 "Sadece Gönderilen dizinine kaydedilen\n"
 "iletileri yeniden gönderebilirsiniz."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Hiç İleti Seçilmedi"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Dosya üzerine yazılsın mı?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "İletileri Farklı Kaydet..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Sonraki okunmamış iletiyi göster"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11545,7 +11823,7 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11554,28 +11832,28 @@ msgstr ""
 "Filtre bilgisini yüklerken hata oluştu:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa %d/%d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "Zarf"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "İletiyi yazdırılmasında hata"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
@@ -11596,7 +11874,7 @@ msgstr "Açıklama yok"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "İsimsiz Bağlantı"
@@ -11616,10 +11894,11 @@ msgid "Add Signature"
 msgstr "İmza Ekle"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Lütfen adınızı ve e-posta adresinizi aşağıdaki boşluğa yazın. Göndereceğiniz "
 "e-posta adresinizin içinde görünmesini istemiyorsanız seçimlik alanları "
@@ -11629,8 +11908,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Lütfen gelen e-posta sunucusu için bilgi verin. Eğer hangi tür bir sunucu "
 "kullandığınızı bilmiyorsanız sistem yöneticinize, ya da İnternet servis "
@@ -11644,22 +11922,20 @@ msgstr "Aşağıdaki seçeneklerden birisini seçin"
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Lütfen giden e-posta sunucusu için protokol bilgisini aşağıda belirtin. Eğer "
 "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:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "E-posta yapılandırma işlemi neredeyse tamamlandı. Kimlik ayarlarınız, "
 "gelen \n"
@@ -11670,40 +11946,20 @@ msgstr ""
 " amaçlı olarak kullanılacaktır."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-msgid "Work"
-msgstr "İş"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr "Kişisel"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-msgid "To Do"
-msgstr "Yapılacaklar"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-msgid "Later"
-msgstr "Sonra"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Hesap"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Servis Denetleniyor"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
@@ -11953,233 +12209,222 @@ msgstr "Kaydet ve Kapat"
 msgid "Loading Images"
 msgstr "Resimler Yükleniyor"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "E-posta Yapılandırması"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 msgid "Message Composer"
 msgstr "Mesaj Düzenleyicisi"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Message Display"
 msgstr "Mesaj Görünümü"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Sunucusu: "
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "Yeni İleti Uyarısı"
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr "Haber Grubu Sunucuları"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Seçimlik Bilgi"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quoted"
 msgstr "_Kotelenmiş"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Cevapla:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "İstenen Bilgiler"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Öntanımlılar"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Güvenlik"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "Güvenli MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "PGP programını seçin"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "E-posta Gönderiliyor"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Sunucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Sunucu Yapılandırması"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Sunucu Türü: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Kısayollar"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 msgid "Signature #1"
 msgstr "1. İmza"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 msgid "Signature #2"
 msgstr "2. İmza"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Kaynak"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Kaynak Bilgisi"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 msgid "Specify _filename:"
 msgstr "_Bir dosya belirtin:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -12190,208 +12435,204 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Doğu"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "İmza dosyası:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Kimlik Denetim Türü: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "_Kimlik denetim türü: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "_Yeni iletileri otomatik denetle:"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "Yeni ileti geldiği zaman ses çıkar"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "_HTML imzası:"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Öntanımlılar"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni ileti geldiğinde haber verme"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Etkinleştir"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "İletiyi _Yönlendir"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "_Tam isim:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML iletide"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images if sender is in addressbook"
 msgstr "Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "İletileri okunmuş olarak işaretle:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Name:"
 msgstr "İsim:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_PGP binary path:"
 msgstr "PGP program yolu:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "Yeni ileti geldiği zaman bir müzik dosyasını çal"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Bu konuyla iletileri filtrelemek için kural oluştur"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "E-posta Alınıyor"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Tümüne cevapla"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "E-posta Gönderiliyor"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Zamanı Farklı Göster"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "İmza dosyası:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Güvenli bağlantı (SSL) kullan"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Değişken"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_her"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " renk"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12415,202 +12656,214 @@ msgstr "S/MIME şifreli zarf içeriği oluşturulamıyor."
 msgid "Could not create a S/MIME decode context."
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Geçici dizin yaratılamadı: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Diske Kaydet..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Eki Kaydet"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "İzle"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "İzle (%s kullanarak)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Gizle"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Harici İzleyici"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Resimler Yükleniyor"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "İleti içeriği yükleniyor"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Zamanı geçen görevler"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Bağlantıyı Tarayıcıda Aç"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Bağlantıyı Farklı Kaydet"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Resmi Farklı Kaydet..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ek"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Hatalı Adres"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Gönderen"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Yanıtla:"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Alıcı"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Bilgi:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Gizli"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "İleti"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "İletiyi Farklı Kaydet..."
-
-#: mail/mail-format.c:1832
-msgid "This message is digitally signed. Click the lock icon for more information."
+#: mail/mail-format.c:1808
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Bu ileti dijital olarak imzalanmıştır ve güvenlidir. Daha fazla bilgi için "
 "kilit simgesi üzerine tıklayın."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "PGP onaylama dosyası oluşturulamadı."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Bu ileti dijital olarak imzalanmıştır ve güvenlidir."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Yerel dosyaya bağ (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "FTP adresine bağ (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Yerel Dizinler"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Dizin yeniden yapılandırılıyor"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Dizin meta bilgisi kaydedilemedi. Büyük ihtimalle bu dizini \n"
 "yeniden açamayacaksınız: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "%s üzerinde dizin kilitlemesi yaratılamadı: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "`%s' dizini silinemedi:\n"
 "%s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" biçiminden \"%s\" biçimine geçiliyor"
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12618,17 +12871,17 @@ msgstr ""
 "Eğer bu dizini tekrar açamazsınız, elle \n"
 "düzeltme yapmak zorunda kalacaksınız."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bu çöp dizininden iletileri kopyalayamazsınız."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Yeniden Yapılandır: %s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12637,7 +12890,7 @@ msgstr ""
 "'%s' sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12646,7 +12899,7 @@ msgstr ""
 "İşlem sırasında hata:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Çalışıyor"
 
@@ -12655,101 +12908,101 @@ msgstr "Çalışıyor"
 msgid "Filtering Folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "E-posta Alınıyor"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" gönderiliyor"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "%d/%d iletide hata"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Yönlendirilen iletiler"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Yeni dizin yaratılıyor"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s iletisi alınıyor"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "İletiler alınıyor"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "İletiler kaydediliyor"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12758,7 +13011,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12767,11 +13020,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12780,27 +13033,22 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Ara"
 
@@ -12857,33 +13105,42 @@ msgstr ""
 msgid "Type: %s"
 msgstr "Tip:"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "E-posta Al & Gönder"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Hepsini İptal Et"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Bu parolayı hatırla"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
@@ -12910,7 +13167,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "İsim:"
 
@@ -12940,7 +13197,7 @@ msgstr "Yönlendirilmiş ileti - %s"
 msgid "Forwarded message"
 msgstr "Yönlendirilen ileti"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Yönlendirilen İleti"
 
@@ -12954,7 +13211,7 @@ msgstr "Yeni dizin yaratılıyor"
 msgid "Updating vfolders for uri: %s"
 msgstr "%s dizini %s adresine kopyalanıyor"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -12963,96 +13220,99 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VDizin"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "Dizinler"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "VFolder Düzenle"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Konusuz)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - İleti"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -13087,47 +13347,47 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "İleri git"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Bilgi Yok"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Tümüne cevapla"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Önizleme"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13151,16 +13411,16 @@ msgstr "\"%s\" dizinine üye olunuyor"
 msgid "Unsubscribing to folder \"%s\""
 msgstr "\"%s\" dizininden üyelik siliniyor"
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Dizin"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Hiç sunucu seçilmedi"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Lütfen bir sunucu seçiniz."
 
@@ -17622,11 +17882,13 @@ msgid "Kushiro Airport"
 msgstr "Kushiro Airport"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+#, fuzzy
+msgid "Kyiv/Boryspil"
 msgstr "Kyyiv/Boryspil"
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+#, fuzzy
+msgid "Kyiv/Zhulyany"
 msgstr "Kyyiv/Zhulyany"
 
 #: my-evolution/Locations.h:1149
@@ -23041,8 +23303,8 @@ msgstr "Açıklama yok"
 msgid "Mail summary"
 msgstr "İleti özeti"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
@@ -23060,15 +23322,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -23080,24 +23342,24 @@ msgstr "RDF indirirken bir hata oluştu"
 msgid "News Feed"
 msgstr "Haber Grubu"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr "Hepsi"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Ekle"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Shown"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Görev yok"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Açıklama Yok)"
 
@@ -24399,7 +24661,8 @@ msgid "Tasks "
 msgstr "Görevler "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Hava durumu ayarları"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24455,7 +24718,7 @@ msgstr "Ayrıntıları Göster"
 msgid "Cancel Operation"
 msgstr "İşlemi İ_ptal Et"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24468,20 +24731,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Yeni bir Dizin Ekle"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Gelen"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Giden"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Gönderildi"
 
@@ -24711,22 +24974,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Yeni dizin yarat"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"İstenen işlem için seçili dizin tipi \n"
-"geçerli değildir ."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Yeni Bir _Dizin Yarat..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Yeni..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(isimsiz)"
 
@@ -24748,7 +25004,7 @@ msgstr ""
 "Eğer dosya türünü bilmiyorsanız \"Otomatik\" seçeneğini işaretleyin. Bu "
 "durumda Evolution dosya türünü bulmaya çalışacaktır."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -24779,21 +25035,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Dizini Seçin"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s dosyası bulunamadı."
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution Hatası"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24802,11 +25054,11 @@ msgstr ""
 "Bunu açabilecek hiç bir filtre bulunamadı:\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Alınıyor"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24815,17 +25067,17 @@ msgstr ""
 "%s alınıyor.\n"
 "%s başlatılıyor"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "%s başlatırken hata oluştu"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "%s yüklenirken hata oluştu"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24834,31 +25086,31 @@ msgstr ""
 "%s alınıyor\n"
 "1. öğe alınıyor."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Dosya adı:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Dosya türü:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Tek dosya aktar"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24866,24 +25118,24 @@ msgstr ""
 "Lütfen bekleyiniz...\n"
 "Mevcut ayarlar aranıyor"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Bu veriyi almak için hedef dizin seçin"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Aktar"
 
@@ -24931,9 +25183,14 @@ msgstr "%s dizini açılıyor"
 msgid "in \"%s\" ..."
 msgstr "%s içinde aç..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Dizinin adı değiştirilemedi: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Belirlenen dizin yaratılamadı:\n"
 "%s"
@@ -24951,8 +25208,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Evolution Posta Asistanı arayüzü başlatılamadı\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Yeni"
@@ -24993,56 +25250,59 @@ msgstr "Dizine git..."
 msgid "Select the folder that you want to open"
 msgstr "Açmak istediğiniz dizini seçin"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Yeni bir kısayol yarat"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Kısayolu işaret etmek istediğiniz dizini seçin:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(dizin gösterilmiyor)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Hiçbiri)"
 
-#: shell/e-shell-view.c:1867
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-view.c:1890
+msgid ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
 "çalışmasını sağlayın."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
 
-#: shell/e-shell-view.c:1880
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-view.c:1903
+msgid ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
 "çalışmasını sağlayın."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25054,12 +25314,12 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kayıt kurulamadı -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25067,31 +25327,31 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Grup adı:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25100,107 +25360,117 @@ msgstr ""
 "Kısayol çubuğundan `%s' grubunu \n"
 "kaldırmak istiyor musunuz?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Silme"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Kısayol Grubunu Yeniden İsimlendir"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Seçili kısayol grubunu yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Küçük Simgeler"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Kısayolları küçük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "_Büyük Simgeler"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Kısayolları büyük simgeler olarak göster"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "Yeni _Grup..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "B_u Grubu Sil..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Bu kısayolu grubunu sil"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "_Bu Grubu Yeniden Adlandır..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Bu kısayol grubunu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Kısayol Çubuğunu _Gizle"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Kısayol çubuğunu gizle"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Yeni bir kısayol yarat"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Yeni bir kısayol yarat"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Kısayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Seçili kısayolları yeniden isimlendir:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Bu kısayola bağlı dizini aç"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Y_eni Pencerede Aç"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Bu kısayolu yeniden isimlendir"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "_Sil"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kısayolu kısayol çubuğundan sil"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Kısayolları kaydederken hata oldu."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
@@ -25209,55 +25479,55 @@ msgstr "Kısayollar"
 msgid "Checkbox"
 msgstr "Araba"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Aynı isimli bir dizin zaten var"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen dizin türü geçerli değildir"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "G/Ç hatası"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Dizin yaratmak için gerekli disk alanı yok"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Dizin boş değil"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Belirtilen dizin bulunamadı"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Fonksiyon desteklenmiyor"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "İşlem desteklenmiyor"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayıtta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Belirtilen dizin düzenlenemedi ya da silinemedi"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Bu isimde bir dizin yaratılamadı"
 
@@ -25312,63 +25582,63 @@ msgstr ""
 "Etkinleştirme sisteminden gelen mesaj:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA hatası"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Kesintiye uğradı"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Geçersiz argüman"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Sahibi yok"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Bulunamadı"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Desteklenmeyen tür"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Desteklenmeyen şema"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Desteklenmeyen işlem"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "İç hata"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Bulunur"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Geçersiz URI"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Alt dizinler"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Hiç boş alan kalmadı"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -25394,6 +25664,26 @@ msgstr "Makina"
 msgid "The following connections are currently active:"
 msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Takvim"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Bağlantılar: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "İ_leti"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Görevler"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Dizin adı:"
@@ -25406,6 +25696,34 @@ msgstr "Dizin türü:"
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yaratılacağını belirtin:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Yeni Bir _Dizin Yarat..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Dizin adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "_Sunucu adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Kullanıcı adı:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Kurulum Yardımcısı"
@@ -25500,15 +25818,15 @@ msgstr "Tekrar sorma"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution'dan çıkılıyor..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25528,7 +25846,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -25536,46 +25854,46 @@ msgstr ""
 "Teşekkürler\n"
 "Ximian Evolution Grubu\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Tekrar sorma"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Ximian Evolution Kabuğuna erişilemedi."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Açılış ekranıni gösterme"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Aktarma işlemi başlıyor"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Aktarma işlemi başlıyor"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parçalar sistemi başlatılamadı."
 
@@ -25611,116 +25929,110 @@ msgstr "Seçimi kopyala"
 msgid "Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Yeni bir bağlantı yarat"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Yeni bir bağlantı listesi yarat"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Seçimi kes"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Seçili bağlantıları sil"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Seçili iletileri başka bir dizine taşı"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Panoyu yapıştır"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Yazdırılacak olan bağlantıları önizler"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Yazdırma Ö_nizlemesi"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Seçili bağlantıları vCard olarak kaydet"
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Hepsini Seç"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Tüm Bağlantıkları Seç"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 #, fuzzy
 msgid "Send a mess to the selected contacts."
 msgstr "Seçili bağlantıları sil"
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Bağlantıya ileti gönder"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Seçilen bağlantıları başkasına gönder."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Dur"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Yüklemeyi Durdur"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "Şimdiki bağlantıyı görüntüle"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Eylemler"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "B_ağlantı Listesi"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Bağlantıyı Gönder..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "VCard Olarak Kaydet"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Bağ_lantıları Ara"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "_Hepsini Seç"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Bağlantıya Mesaj Gönder..."
@@ -25765,11 +26077,6 @@ msgstr "Ay"
 msgid "Previews the calendar to be printed"
 msgstr "Yazdırılacak olan takvimi önizler"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Yazdırma Ö_nizlemesi"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Bu takvimi yazdır"
@@ -25802,7 +26109,7 @@ msgstr "Hafta"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Kapat"
 
@@ -25815,7 +26122,7 @@ msgid "Delete this item"
 msgstr "Bu öğeyi sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Ana araç çubuğu"
 
@@ -25827,8 +26134,8 @@ msgstr "Yazdırılacak olan öğeyi önizle"
 msgid "Print this item"
 msgstr "Bu öğeyi yazdır"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Kaydet"
 
@@ -25853,9 +26160,9 @@ msgstr "Bu öğeyi diske kaydet"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Dosya"
 
@@ -25865,7 +26172,7 @@ msgstr "_Zarfı Yazdır..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Farklı Kaydet..."
 
@@ -25879,8 +26186,8 @@ msgstr "Bağlantıya Mesaj Gönder..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Kaydet"
 
@@ -25977,26 +26284,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Yeni İ_leti"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "İletiler dizine kaydediliyor"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "İleti önizleme penceresini göster"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Uzak sunuculardaki dizinlere üyelik işlemini gerçekleştir"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Sanal Dizin _Düzenleyici..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Filtreler..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Önizleme _Panosu"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "_Dizinlere Üye Ol..."
 
@@ -26029,7 +26346,8 @@ msgid "Hide _Read Messages"
 msgstr "_Okunan İletileri Gizle"
 
 #: 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 "Silinen iletileri üzerine çizgi çekmek yerine gizle"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -26092,7 +26410,7 @@ msgstr "Konumlandırılan İleti listesi"
 msgid "_Expunge"
 msgstr "_Sil"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Dizin"
 
@@ -26350,176 +26668,191 @@ msgid "P_revious Unread Message"
 msgstr "Önceki _Okunmamış İleti"
 
 #: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "Görev Yanıtı"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Yeni iletileri tüm dizinlerde denetle"
+
+#: ui/evolution-mail-message.xml.h:64
 msgid "Pr_evious Important Message"
 msgstr "Önceki Ö_nemli İleti"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Yazdırılacak İletiyi Önizle"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Geri"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Bu iletiyi yazdır"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "_Yeniden Yönlendir"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Seçili iletiyi başkasına yönlendir"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Metni orjinal boyuna getir"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "İle_tide Ara..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Daha küçük"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "İletiyi bir dosyaya kaydet"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Görüntülenen ileti içinde bir metin ara"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Güncel yazıcı için sayfa ayarlarını yap"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "İleti _Kaynağını Göster"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "_Kapsamlı Başlıkları Göster"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "İletiyi normal biçemde göster"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "İletiyi tüm başlıklarıyla göster"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "İletinin kaynağını göster"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Metin _Boyu"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Seçilen iletiyi silme"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "_E-posta Listesine Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "_Gönderene Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "_Alıcılara Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "_Konuya Göre VFolder..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Ekli"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "İ_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "İletiyi _Yönlendir"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Go To"
 msgstr "_Git"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "_Bağlantıda"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Daha büyük"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "İleti _Görünümü"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Dizine _Taşı"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 msgid "_Next Message"
 msgstr "_Sonraki İleti"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Normal _Gösterim"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "İ_letiyi Aç "
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 msgid "_Previous Message"
 msgstr "Önceki İ_leti"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "_Kotelenmiş"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Y_eniden İsimlendir..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Araçlar"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "_Kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Göster"
 
@@ -26547,169 +26880,161 @@ msgstr "Bu iletiyi S/MIME şifreleme sertifikasıyla şifrele"
 msgid "For_mat"
 msgstr "Biçi_m"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Metin D_osyası Ekle..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Bir dosyayı ileti içine ekle"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Metin dosyası ekle..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Aç"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Bir dosya aç"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP Şifre"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP İmza"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME Şifreleme"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME İmza"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Farklı Kaydet"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "_Taslağı Kaydet"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Dizine kaydet..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Şimdiki zamanı kaydet"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Güncel dosyayı farklı bir isimle kaydet"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "İletiyi belirtilen dizine kaydet"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Gönder"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "_Sonra Gönder"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Sonra _gönder"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "İletiyi HTML olarak gönder"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "İletiyi daha sonra gönder"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Bu iletiyi şimdi gönder"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Ekleri göster/gizle"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Ekleri _göster"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Ekleri göster"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "PGP anahtarıyla bu iletiyi imzala"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "S/MIME imza sertifikasıyla bu iletiyi imzala"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bcc alanını gösterir/gizler"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Cc alanını gösterir/gizler"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Gönderen alanını gösterir/gizler"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Yanıtla alanını gösterir/gizler"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "_Eklenti"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "_Gizli Alanı"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "_Bilgi Alanı"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "He_psini sil"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "_Gönderen Alanı"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Ekle"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Aç..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "_Yanıtla Alanı"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Öğeyi kaydet ve iletişim penceresini kapat"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "_Yardım"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "İmzayı kaydet"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Bu dizini üye dizinler listesine ekle"
@@ -26805,171 +27130,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "_Kısayol Çubuğuna Ekle"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Bu dizinin adını değiştir"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Bu Dizini Kopyala"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Yeni Bir _Dizin Yarat..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Kısayol çubuğunda bu dizine bir bağlantı oluştur"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Yeni bir dizin yarat"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Yeni bir kısayol yarat"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Yeni bir dizin yarat"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Bu dizini sil"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Farklı bir dizin göster"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Çı_k"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution _Penceresi"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Programdan çık"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Diğer programlardan veri al"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Bu dizini başka bir yere taşı"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Yeni Bir _Dizin Yarat..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Yeni Pencerede Aç"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Bu dizini yeni bir pencerede aç"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Pilot Ayarları..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Al / Gönder"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "E-posta Yapılandırması"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Aç/kapat"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Kısayol çubuğunu göster/gizle"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Seçili dizini göster"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _SSS"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Ximian _Evolution Hakkında..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "_Dizin Çubuğu"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_Dizin"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Dizine _Git..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Taşı..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "_Yeni Dizin"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "_Pilot Ayarları..."
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_Tekrarlama yok"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "Y_eniden İsimlendir..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Kısayol"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "_Kısayol Çubuğu"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Kısayol"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Yazdırma özeti"
@@ -26983,17 +27339,40 @@ msgid "Reload the view"
 msgstr "Görünümü tekrar yükle"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Adres Kartları"
+#, fuzzy
+msgid "By _Company"
+msgstr "Şirket"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Şirket"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Adres Kartları"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Telefon Listesi"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Hafta Görünümü"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Gün Görünümü"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Ay Görünümü"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Çalışma Haftası Görünümü"
+
 #: views/mail/galview.xml.h:1
 msgid "As Sent Folder"
 msgstr "Gönderilmiş Dizin Olarak"
@@ -27018,13 +27397,19 @@ msgstr "Konu"
 msgid "Messages"
 msgstr "İletiler"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Kategori"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Görev"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27173,11 +27558,11 @@ msgstr "Karakter Kodlama"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Arama Düzenleyici"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Aramayı Kaydet"
 
@@ -27214,20 +27599,20 @@ msgstr "İleti"
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 msgid "_Find Now"
 msgstr "Ş_imdi Bul"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Temizle"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Şimdi Bul"
 
@@ -27241,18 +27626,132 @@ msgstr "Kişisel Adres Defteri Sunucusu"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Kişisel Takvim Sunucusu"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): GNOME-VFS başlatılamadı"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): GNOME başlatılamadı"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Bonobo başlatılamadı"
 
+#~ msgid "_Browse..."
+#~ msgstr "_Gözat..."
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Bu Randevuyu Sil"
+
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "Gönderen: %s\n"
+#~ "Konu: %s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL Protokol hatası"
+
+#~ msgid "I/O Error: %s"
+#~ msgstr "G/Ç hatası: %s"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Giriş hatası: %s: önemsiz"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO zaman aşımı: %s: ileti gönderilmedi"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELO cevap hatası: %s: ileti gönderilmedi"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT isteği zaman aşımına uğradı: %s: önemsiz"
+
+#~ msgid "Insert File"
+#~ msgstr "Dosya _Ekle"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Hatalı tarih seçimi yaptınız."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Bu iletinin tarihi filtrenin çalıştırıldığı\n"
+#~ "ya da vfolder'ın açıldığı tarih ile\n"
+#~ "karşılaştırılacaktır."
+
+#~ msgid "Command"
+#~ msgstr "Komut"
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution Haber Grubu Düzenleyici"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Gerçekten bu haber grubu hesabını silmek istiyor musunuz?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Bu e-postayı göndermeden önce bir hesap ayarı yapmalısınız."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Sunucusu: "
+
+#~ msgid "News Servers"
+#~ msgstr "Haber Grubu Sunucuları"
+
+#~ msgid "Source"
+#~ msgstr "Kaynak"
+
+#~ msgid "Source Information"
+#~ msgstr "Kaynak Bilgisi"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Diske Kaydet..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "İletiyi Farklı Kaydet..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Yeni dizin yarat"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "İstenen işlem için seçili dizin tipi \n"
+#~ "geçerli değildir ."
+
+#~ msgid "_Contact List"
+#~ msgstr "B_ağlantı Listesi"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Metin D_osyası Ekle..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Bir dosyayı ileti içine ekle"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Metin dosyası ekle..."
+
+#~ msgid "Send _Later"
+#~ msgstr "_Sonra Gönder"
+
+#~ msgid "Send _later"
+#~ msgstr "Sonra _gönder"
+
+#~ msgid "Send the message later"
+#~ msgstr "İletiyi daha sonra gönder"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "_Pilot Ayarları..."
+
 #, fuzzy
 #~ msgid "Addressbook Settings"
 #~ msgstr "Adres Defteri Kaynakları"
@@ -27389,10 +27888,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgstr "Somerset"
 
 #, fuzzy
-#~ msgid "Select a signature file"
-#~ msgstr "İmza dosyası:"
-
-#, fuzzy
 #~ msgid "Select a signature script"
 #~ msgstr "İmza dışında tümünü sil"
 
@@ -27664,10 +28159,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgstr "Cevap İstiyor"
 
 #, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Sunucuya bağlantı kurulamadı: %s"
-
-#, fuzzy
 #~ msgid "Create vFolder from Search"
 #~ msgstr "İ_letiden Bir Filtre Yarat"
 
@@ -27710,10 +28201,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgstr "Kurum:"
 
 #, fuzzy
-#~ msgid "_Remember this password"
-#~ msgstr "Bu parolayı hatırla"
-
-#, fuzzy
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "E-postaları öntanımlı olarak HTML gönder."
 
@@ -27765,15 +28252,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Y_eni Bir Randevu Oluştur"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Yeni bir randevu oluştur"
-
-#~ msgid "Create a new meeting request"
-#~ msgstr "Yeni bir toplantı isteği oluştur"
-
-#~ msgid "Create a new task"
-#~ msgstr "Yeni bir görev oluştur"
-
 #~ msgid "Create an event for the whole day"
 #~ msgstr "Tüm gün için bir olay oluştur"
 
@@ -27795,9 +28273,6 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "E-posta hesaplarını düzenle ve diğer seçenekler"
 
-#~ msgid "New Message"
-#~ msgstr "Yeni İ_leti"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "E-posta Ayarları..."
 
@@ -27821,4 +28296,3 @@ msgstr "init_bonobo(): Bonobo başlatılamadı"
 
 #~ msgid "Sear_ch"
 #~ msgstr "A_ra"
-
diff --git a/po/uk.po b/po/uk.po
index 88610de06f..99b5cef829 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.5\n"
-"POT-Creation-Date: 2002-07-04 20:47+0300\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-07-04 16:55+0200\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -34,7 +34,7 @@ msgstr "Імпорт файлів VCard у Evolution."
 msgid "File As"
 msgstr "Файл як"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Ім'я:"
@@ -342,46 +342,46 @@ msgstr "vCard для %s"
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:343
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Пошук..."
 
-#: addressbook/backend/pas/pas-backend-file.c:345
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:368
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Помилка у регулярному виразі."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Додавання картки з сервером LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Видалення картки з сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Зміна картки на сервері LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Почати пошук знову."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Отримання результатів пошуку на LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Помилка видалення картки"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Неможливо проаналізувати URL \"%s\""
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:624
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Контакти"
 
@@ -493,31 +493,30 @@ msgstr "Сервер LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Сервер LDAP, що містить контактну інформацію"
 
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "New Contact List"
-msgstr "Новий контактний список"
-
-#: addressbook/gui/component/addressbook-component.c:580
-msgid "Contact _List"
-msgstr "Контактний _список"
-
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "Create a new contact list"
-msgstr "Створити новий контактний список"
-
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/component/addressbook-component.c:584
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:585
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Створити новий контакт"
 
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "Новий контактний список"
+
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "Contact _List"
+msgstr "Контактний _список"
+
+#: addressbook/gui/component/addressbook-component.c:569
+msgid "Create a new contact list"
+msgstr "Створити новий контактний список"
+
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
 msgid "Failed to connect to LDAP server"
@@ -569,11 +568,11 @@ msgstr "Не вдалось ініціалізувати gnome-vfs"
 msgid "Other Contacts"
 msgstr "Інші контакти"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -582,7 +581,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає що, або ви\n"
 "дали невірний URI, або не працює LDAP сервер"
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -594,7 +593,7 @@ msgstr ""
 "встановити LDAP з вказаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\n"
 
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -602,42 +601,42 @@ msgstr ""
 "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введіть пароль для %s (користувач %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 msgid "Name begins with"
 msgstr "Ім'я починається з"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 msgid "Email is"
 msgstr "Ел.адреса"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Категорія - "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Будь-яке поле містить"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Додатково..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Будь-яка категорія"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде відображено переглядачем"
 
@@ -704,49 +703,51 @@ msgid "  S_how Supported Bases "
 msgstr "Перевірка типів, що підтримуються"
 
 #: addressbook/gui/component/ldap-config.glade.h:2
-msgid "&lt;&lt; Fewer Options"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "&lt;- _Remove"
-msgstr "&lt;- _Видалити"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "666"
 msgstr "666"
 
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<- _Remove"
+msgstr "Видалити"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<< Fewer Options"
+msgstr "Параметри"
+
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -755,7 +756,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 msgid "Always"
 msgstr "Завжди"
@@ -847,8 +848,8 @@ msgstr "Конфігурація"
 msgid "Mappings"
 msgstr "Поля"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "кожні"
@@ -900,8 +901,8 @@ msgstr "Діапазон пошуку:"
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Пошук"
 
@@ -1096,21 +1097,22 @@ msgid "Using email address"
 msgstr "Електронна адреса:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Додати"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add -&gt;"
-msgstr "_Додати -&gt;"
+#, fuzzy
+msgid "_Add ->"
+msgstr "Додати"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
 #, fuzzy
@@ -1150,12 +1152,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "Редагування"
@@ -1187,8 +1189,9 @@ msgid "_Log in method:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:121
-msgid "_More Options &gt;&gt;"
-msgstr ""
+#, fuzzy
+msgid "_More Options >>"
+msgstr "Параметри"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
 #, fuzzy
@@ -1269,10 +1272,10 @@ msgstr "Фабрика для інтерфейсу вибору імені з к
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Видалити"
 
@@ -1301,41 +1304,15 @@ msgstr "(%d не показано)"
 msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Вибрати контакти з книги адрес"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Відправник містить"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution неспроможній отримати локальну книгу адрес.\n"
-"Це може бути спричинено аварійним завершенням компонента книги адрес.\n"
-"Щоб допомогти розробникам швидше знайти та вирішити проблему,\n"
-"будь ласка надішліть лист з детальним описом обставин виникнення помилки\n"
-"за адресою Jon Trowbridge <trow@ximian.com>. Дякуємо вам."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution неспроможній отримати локальну книгу адрес.\n"
-"У звичайних обставинах це ніколи не трапляється.\n"
-"Необхідно закрити Evolution та запустити його знову."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Вибрати контакти з книги адрес"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Вибрати назви"
@@ -1357,15 +1334,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "Перенести..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "Категорія:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "Тека:"
 
@@ -1470,11 +1442,12 @@ msgstr "Хоче отримувати листи в HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1724
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:44
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -2714,7 +2687,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Приховати адресу при надсиланні пошти до цього списку"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Видалити"
 
@@ -2777,7 +2750,7 @@ msgstr ""
 "існує у цій теці.  Чи хочете ви додати його у всякому випадку?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Удосконалений пошук"
 
@@ -2804,21 +2777,21 @@ msgid "Error getting book view"
 msgstr "Помилка отримання вигляду книги"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Помилка модифікації картки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1084
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Успішно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2170
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1123
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -2826,8 +2799,8 @@ msgstr "Невідома помилка"
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1114
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
@@ -2844,7 +2817,7 @@ msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2867,48 +2840,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Файлу %s не існує"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Інша помилка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Ви хочете змінити зміни?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Помилка додавання списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Помилка додавання картки"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Помилка модифікування списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Помилка видалення списку"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Помилка видалення картки"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Відобразити"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Відобразити"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2916,22 +2894,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Перенести повідомлення у"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Скопіювати вибране завдання"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Немає карток"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Немає карток"
@@ -3004,7 +2982,7 @@ msgstr "Адресна книга"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
@@ -3044,7 +3022,7 @@ msgid "Pilot Settings..."
 msgstr "Установки пілота..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслати контакт"
 
@@ -3053,8 +3031,8 @@ msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Друкувати"
@@ -3074,7 +3052,7 @@ msgid "Move to folder..."
 msgstr "Перенести в теку..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
@@ -3085,20 +3063,20 @@ msgid "Copy"
 msgstr "Скопіювати"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:228 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Стерти"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3461
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "Поточний рік"
@@ -3269,7 +3247,7 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Кількість стовпчиків:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Параметри"
 
@@ -3359,26 +3337,26 @@ msgstr "Зустріч без заголовку"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Високий"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Низький"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Невизначено"
@@ -3499,11 +3477,11 @@ msgstr "Час засипання (в хвилинах)"
 msgid "_Edit appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Немає опису."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3515,13 +3493,13 @@ msgstr ""
 "Замість цього Evolution буде показувати звичайне вікно\n"
 "нагадування."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Попередження"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, fuzzy, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3538,7 +3516,7 @@ msgstr ""
 "\n"
 "Ви впевнені, що бажаєте виконати цю програму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Не питати знову."
@@ -3567,7 +3545,7 @@ msgstr "Опис містить"
 msgid "Comment contains"
 msgstr "Коментар містить"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Інше"
 
@@ -3578,7 +3556,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3600,17 +3578,17 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "Неможливо створити вікно календарю. Перевірте параметри ORBit та OAF. "
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Приватне"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Конфіденційне"
@@ -3635,37 +3613,37 @@ msgstr "Сх"
 msgid "W"
 msgstr "Зах"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Вільний"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Виконується"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3676,56 +3654,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1686 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:455
-#: mail/mail-accounts.c:464 mail/mail-accounts.c:519
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Немає"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Періодично"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Ні"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Перегляд доби"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Показ робочого тижня"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Показ тижня"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Показ місяця"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3733,12 +3710,12 @@ msgstr "Календар"
 msgid "Folder containing appointments and events"
 msgstr "Тека, що містить інформацію про зустрічі та події"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Завдання"
 
@@ -3746,63 +3723,63 @@ msgstr "Завдання"
 msgid "Folder containing to-do items"
 msgstr "Тека, що містить елементи \"Виконати\""
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Нова зустріч"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Зустріч"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Створити нову зустріч"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Параметри новин"
 
-#: calendar/gui/component-factory.c:706
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/component-factory.c:707
+#: calendar/gui/component-factory.c:714
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/component-factory.c:711
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/component-factory.c:717
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/component-factory.c:721
-#, fuzzy
-msgid "New appointment"
-msgstr "Нова зустріч"
-
-#: calendar/gui/component-factory.c:721
-#, fuzzy
-msgid "_Appointment"
-msgstr "Зустріч"
-
-#: calendar/gui/component-factory.c:722
-msgid "Create a new appointment"
-msgstr "Створити нову зустріч"
-
 #: calendar/gui/control-factory.c:123
 #, c-format
 msgid "Could not open the folder in '%s'"
@@ -3868,7 +3845,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "З цими аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "діб"
 
@@ -3876,11 +3854,13 @@ msgstr "діб"
 msgid "extra times every"
 msgstr "додатковий час кожні"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "години"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "хвилини"
 
@@ -4008,7 +3988,7 @@ msgstr "Нагадування"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -4037,7 +4017,7 @@ msgstr "кінець зустрічі"
 msgid "hour(s)"
 msgstr "годин(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "хвилин(а)"
 
@@ -4215,7 +4195,7 @@ msgid "_Fri"
 msgstr "Птн"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "Загальне"
 
@@ -4260,19 +4240,33 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "Перед початком зустрічі"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Стан засідання змінився. Надіслати оновлену версію?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Ви впевнені, що хочете відмінити та видалити це завдання?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
 
@@ -4340,61 +4334,61 @@ msgstr ""
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3721 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Неможливо отримати поточну версію!"
 
@@ -4593,7 +4587,7 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Зацікавлена персона"
@@ -4605,7 +4599,7 @@ msgstr "Роль"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
@@ -4691,7 +4685,7 @@ msgstr "у"
 msgid "first"
 msgstr "Мгла"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "секунда"
 
@@ -4715,7 +4709,7 @@ msgstr "список"
 msgid "Other Date"
 msgstr "Інший факс"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "день"
 
@@ -4815,20 +4809,26 @@ msgstr "% виконання:"
 msgid "Date Completed:"
 msgstr "Дата виконання:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Необхідна дія"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Поступ"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "Пріоритет:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "Стан:"
 
@@ -4842,7 +4842,7 @@ msgstr "Основні"
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4857,123 +4857,134 @@ msgid "_Due Date:"
 msgstr "Обумовлена дата:"
 
 #: calendar/gui/e-calendar-table.c:440
+#, c-format
 msgid "0%"
 msgstr "0%"
 
 #: calendar/gui/e-calendar-table.c:441
+#, c-format
 msgid "10%"
 msgstr "10%"
 
 #: calendar/gui/e-calendar-table.c:442
+#, c-format
 msgid "20%"
 msgstr "20%"
 
 #: calendar/gui/e-calendar-table.c:443
+#, c-format
 msgid "30%"
 msgstr "30%"
 
 #: calendar/gui/e-calendar-table.c:444
+#, c-format
 msgid "40%"
 msgstr "40%"
 
 #: calendar/gui/e-calendar-table.c:445
+#, c-format
 msgid "50%"
 msgstr "50%"
 
 #: calendar/gui/e-calendar-table.c:446
+#, c-format
 msgid "60%"
 msgstr "60%"
 
 #: calendar/gui/e-calendar-table.c:447
+#, c-format
 msgid "70%"
 msgstr "70%"
 
 #: calendar/gui/e-calendar-table.c:448
+#, c-format
 msgid "80%"
 msgstr "80%"
 
 #: calendar/gui/e-calendar-table.c:449
+#, c-format
 msgid "90%"
 msgstr "90%"
 
 #: calendar/gui/e-calendar-table.c:450
+#, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3479 mail/folder-browser.c:1697
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Відкрити"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3453 calendar/gui/e-week-view.c:3481
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3486 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вирізати"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3487 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Скопіювати"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3457
-#: calendar/gui/e-week-view.c:3488 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Призначити завдання"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Позначити завдання як виконані"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7434
-#: calendar/gui/e-week-view.c:4202
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Клацніть щоб додати завдання"
@@ -4982,8 +4993,8 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Alarms"
 msgstr "Сповіщення"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Виконано"
 
@@ -5011,11 +5022,9 @@ msgstr "Пріоритет"
 msgid "Start Date"
 msgstr "Дата початку"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:778
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Зведення"
 
@@ -5057,109 +5066,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "дп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3447
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3448
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3449
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3463
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3464
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3468
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Конфігурація"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Конфігурація"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3480
-#: mail/folder-browser.c:1699 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Планувати зустріч"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3498
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "Зробити цей екземпляр рухомим"
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3499
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3500
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3849
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Здається, програму GNOME Pilot не встановлено на цій системі"
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3855
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Помилка виконання %s."
@@ -5200,7 +5209,7 @@ msgstr "Завдання виконано: <b>"
 msgid "Task Due: <b>"
 msgstr "Термін виконання завдання: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
@@ -5209,12 +5218,12 @@ msgstr "Інформація iCalendar"
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Невідома персона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5222,319 +5231,324 @@ msgstr ""
 "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
 "нижнього меню."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Місце:"
+
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "Стан:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Невідоме"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Оновити"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2160 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Гаразд"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1086 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Невірне повідомлення про засідання"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пропонує вам прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Невірне повідомлення про завдання"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "Невірне повідомлення про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Повідомлення невірно сформовано"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Під'єднаний файл не містить вірно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Під'єднаний файл не містить елементів календарю, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Неможливо оновити календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан невірний!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Вибір теки"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Вибір теки"
@@ -5580,7 +5594,7 @@ msgstr "дата-початку"
 msgid "Chair Persons"
 msgstr "Головуючі"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Потрібні учасники"
 
@@ -5593,57 +5607,52 @@ msgid "Non-Participants"
 msgstr "Не учасники"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Індивідуальне"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Групове"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Ресурс"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Кімната"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Місце"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Потрібний учасник"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Необов'язковий учасник"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Не учасник"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Необхідна дія"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Експериментальний"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Доручено"
 
@@ -5733,49 +5742,46 @@ msgstr "Час початку зібрання:"
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити завдання в \"%s\""
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не вдалося відкрити теку в \"%s\""
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата завершення"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Викреслення теки"
 
-#: calendar/gui/e-week-view.c:3446
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-week-view.c:3497
-msgid "_Delete this Appointment"
-msgstr "Стерти цю зустріч"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5786,11 +5792,16 @@ msgstr "Не вдалося відкрити теку в \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Відкривання календаря на %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Відкривання теки %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Квітень"
@@ -5847,47 +5858,47 @@ msgstr "Жовтень"
 msgid "September"
 msgstr "Вересень"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Потрібен хоча б один учасник"
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Інформація про подію"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Інформація про журнал"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Календарна інформація"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 msgid "Updated"
 msgstr "Оновлено"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 msgid "Refresh"
 msgstr "Оновити"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Ви маєте бути відвідувачем події."
 
@@ -6123,9 +6134,8 @@ msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
@@ -6161,8 +6171,8 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Не питати знову."
 
@@ -6228,17 +6238,29 @@ msgstr "Імпорт файлів VCard у Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Імпорт файлів VCard у Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr ""
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Нагадування"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Календарне повідомлення"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6247,84 +6269,84 @@ msgstr ""
 "Evolution знайшов поштові файли Pine.\n"
 "Чи бажаєте ви імпортувати їх у Evolution?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Календар"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now не передбачає аргументів"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time очікує 1 аргумент"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time очікує, що 1 аргумент буде символьного типу"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "перший аргумент make-time повинен бути датою у форматі ISO 8601"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day очікує 2 аргументи"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day очікує, що 2 аргумент буде числом"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin очікує 1 аргумент"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end очікує 1 аргумент"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype не очікує аргументів"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? очікує 2 аргументи"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? очікує, що 2 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? очікує 2 аргументи"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? очікує, що 1 аргумент буде символьного типу"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? очікує, що 2 аргумент буде символьного типу"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -6332,11 +6354,11 @@ msgstr ""
 "contains? очікує, що 1 аргумент буде одним з \"any\", \"summary\", "
 "\"description\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? очікує принаймні 1 аргумент"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6344,19 +6366,19 @@ msgstr ""
 "has-categories? очікує, що усі аргументи будуть символьного типу, або єдиний "
 "аргумент логічного типу - хибність (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? не очікує аргументів"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? очікує 1 аргумент"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? очікує, що 1 аргумент буде типу time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Виконання пошуку не дало логічного значення"
 
@@ -7955,72 +7977,82 @@ msgstr "Збереження теки \"%s\""
 msgid "You must be working online to complete this operation"
 msgstr "Ви повинні робити в мережі для завершення цієї операції"
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "Не вдалося відкрити буферну теку"
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "Не вдалося обробити буферну теку"
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Збій декодування повідомлення."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Невірні аргументи"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Невірні аргументи"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Збій кешування повідомлення %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Збій кешування повідомлення %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
@@ -8102,7 +8134,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
 #: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
-#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Відмінено."
 
@@ -8171,22 +8203,22 @@ msgid "Could not lock '%s'"
 msgstr "Не вдалося заблокувати %s"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не вдалося створити файл блокування для %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Вийшов час при спробі блокування файлу %s. Спробуйте ще раз пізніше."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
@@ -8245,11 +8277,15 @@ msgstr "Помилка запису пошти у тимчасовий файл:
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка копіювання тимчасового поштового файлу: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8381,7 +8417,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Невірна автенфікація від сервера."
 
@@ -8555,31 +8591,134 @@ msgstr "Не вдалося отримати теку: неприпустима
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося створити теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Збір перевірки сертифікатів."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Збір перевірки сертифікатів."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Не вдалося зберегти файл підпису."
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "Ідентифікатор сертифіката:"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
 msgstr ""
-"Невірний сертифікат з %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Бажаєте прийняти його?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Помилка завантаження %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "За межами офісу"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Збір перевірки сертифікатів."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "Ідентифікатор сертифіката:"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Невірний аргумент"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "Ідентифікатор сертифіката:"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "Ідентифікатор сертифіката:"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8588,16 +8727,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Невірний сертифікат з %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Бажаєте прийняти його?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8617,17 +8773,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Неможливо проаналізувати URL \"%s\""
 
-#: camel/camel-vee-folder.c:616
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Помилка запуску %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Невірне повідомлення %s в %s"
 
-#: camel/camel-vee-folder.c:801 camel/camel-vee-folder.c:807
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Перевіряти нову пошту в усіх теках"
@@ -8655,12 +8811,12 @@ msgstr "Неможливо перейменувати теку: %s: Немає �
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано закрив з'єднання: %s"
@@ -8689,40 +8845,40 @@ msgstr "Відповідь сервера IMAP не містить інформ�
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неочікувана відповідь OK від сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не вдалося завантажити зведення для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 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:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "Отримання інформації про нові повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Пошук нових повідомлень"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
 
@@ -8731,10 +8887,10 @@ msgstr "Не вдалося знайти тіла повідомлення у в
 msgid "Could not open cache directory: %s"
 msgstr "Не вдалося відкрити каталог кешу: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Збій кешування повідомлення %s: %s"
@@ -8747,7 +8903,7 @@ msgstr "Перевіряти нову пошту"
 msgid "Check for new messages in all folders"
 msgstr "Перевіряти нову пошту в усіх теках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1042
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Теки"
 
@@ -8778,7 +8934,7 @@ msgstr "Для зчитування та збереження пошти на с
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Пароль"
 
@@ -8786,73 +8942,77 @@ msgstr "Пароль"
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s служба для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "З'єднання скасовано"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, 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:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Операція не підтримується"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Збій автенфікації."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Тека не порожня"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автенфікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Немає підтримки автенфікації типу %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8863,31 +9023,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Невірна тека \"%s\""
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Назва теки не може містити символ вводу."
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Неможливо відкрити поштову скриньку: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -8909,7 +9075,10 @@ msgid "Local delivery"
 msgstr "Локальне відвантаження"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 "Для отримання локальної пошти з стандартного накопичувача у форматі mbox."
 
@@ -8938,14 +9107,14 @@ msgstr "Стандартні накопичувачі Unix mbox"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 ""
 "Для зчитування та збереження локальної пошти у стандартних накопичувальних "
 "файлах mbox."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8956,38 +9125,38 @@ msgstr "Корінь сховища %s не є абсолютним шляхом
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "локальне сховище не містить тека Вхідні"
 
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не вдалося стерти файл зведення теки \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не вдалося стерти індексний файл теки \"%s\": %s"
@@ -9047,7 +9216,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9085,26 +9254,26 @@ msgstr "каталог не Maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Не вдалося проскакувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Неможливо відкрити шлях до теки поштового каталогу: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Перевіряти нову пошту"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Пошук нових повідомлень"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Збереження теки"
@@ -9148,7 +9317,7 @@ msgstr "Схоже тека непоправно зіпсована."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
 
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9157,7 +9326,7 @@ msgstr ""
 "Не вдалося відкрити файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9166,14 +9335,14 @@ msgstr ""
 "Не вдалось створити файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" не є звичайним файлом."
 
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9182,7 +9351,7 @@ msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
@@ -9197,64 +9366,64 @@ msgstr "Не вдалося відкрити теку %s: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальна помилка поштового аналізатора на позиції %ld в теці %s"
 
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Неможливо перевірити теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не вдалося відкрити файл %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не вдалося відкрити тимчасову поштову скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не вдалося закрити вихідну теку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Зведення і тека не співпадають, навіть після синхронізації"
 
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Невідома помилка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Помилка запису в тимчасову пошту скриньку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Збій запису в тимчасову поштову скриньку: %s: %s"
@@ -9405,50 +9574,50 @@ msgstr "Скасувати"
 msgid "Operation failed: %s"
 msgstr "Операцію скасовано"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Отримання POP-зведення"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Операцію скасовано"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Викидання стертих повідомлень"
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Немає повідомлення з UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Отримання повідомлення POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Неможливо отримати повідомлення: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Невідомі опади"
@@ -9466,7 +9635,7 @@ msgstr "Залишати повідомлення на сервері"
 msgid "Delete after %s day(s)"
 msgstr "Стирати по завершенню %s днів"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9492,6 +9661,11 @@ msgstr ""
 "зашифрованого згідно протоколу APOP.Це може спрацьовувати не для всіх "
 "користувачів, навіть якщо сервер нібито його підтримує."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9503,54 +9677,59 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Не вдалося з'єднатись з сервером POP на %s."
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Неможливо під'єднатись до POP серверу.\n"
 "Відсутня підтримка потрібного механізму автенфікації."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Помилка вводу/виводу"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr ""
+"Неможливо автентифікуватися на сервері IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль POP3 для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Невірна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9577,35 +9756,35 @@ msgstr "Не вдалося створити канал до sendmail: %s: по�
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Не вдалося виконати sendmail: %s: пошту не відіслано"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Не вдалося відіслати повідомлення: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail завершився сигналом %s: пошту не відіслано."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Не вдалося виконати %s: пошту не відіслано."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail завершився з станом %d: пошту не відіслано."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "Постачання пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9714,45 +9893,45 @@ msgstr "Тимчасовий збій автенфікації"
 msgid "Authentication required"
 msgstr "Вимагається автенфікація"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Помилка стадії під'єднання: %s: можливо не фатально"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Помилка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Неможливо під'єднатись до POP серверу.\n"
 "Помилка при передачі імені користувача: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Повідомлення невірно сформовано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Затримка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Помилка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP сервер %s не підтримує автенфікацію %s типу"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sВведіть SMTP пароль для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9763,90 +9942,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Постачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо відіслати повідомлення: адреса відправника не вірна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Привітання SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Перевищено час очікування відповіді на HELO: %s: не фатально"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Помилка відповіді на HELO: %s: не фатально"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Затримка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Помилка відповіді на RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Автенфікація SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Помилка створення об'єкта автенфікації SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перевищено час очікування відповіді на AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Збій запиту AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Невірна автенфікаціна відповідь від сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Затримка відповіді на MAIL FROM: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Помилка відповіді на MAIL FROM: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Затримка відповіді на RCPT TO: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Затримка відповіді на DATA: %s: пошту не відіслано"
@@ -9854,91 +10033,91 @@ msgstr "Затримка відповіді на DATA: %s: пошту не ві�
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Помилка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Вийшов час при надсиланні DATA: надсилання припинено: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Невірна автенфікація від сервера."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Затримка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Помилка відповіді на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "затримка відповіді на QUIT: %s: не фатально"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Перевищено час очікування відповіді на AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Помилка відповіді на RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u байтів"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибрані елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Долучити файл до повідомлення"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Неможливо долучити файл %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Неможливо долучити файл %s: не звичайний файл."
@@ -9956,56 +10135,60 @@ msgid "MIME type:"
 msgstr "Тип MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Показувати під'єднання автоматично"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Клацніть тут щоб викликати адресну книгу"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Від:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Відповідати на:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Від:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Введіть адресатів повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введіть адресатів, що отримають копію повідомлення"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10013,17 +10196,25 @@ msgstr ""
 "Введіть адресатів, що отримають копію повідомлення не попавши в список "
 "отримувачів."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Порто"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Неможливо створити контекст цифрового підпису PGP."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10032,34 +10223,34 @@ msgstr ""
 "Помилка зчитування файлу: %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Попередження!"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "Файл існує, переписати?"
 
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Помилка доступу до файлу: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10068,7 +10259,7 @@ msgstr ""
 "Неможливо встановити позицію у файлі: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10077,7 +10268,7 @@ msgstr ""
 "Неможливо обрізати файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10086,7 +10277,7 @@ msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10094,7 +10285,7 @@ msgstr ""
 "Ximian Evolution знайшов незбережені файли попереднього сеансу.\n"
 "Бажаєте спробувати їх відновити?"
 
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10104,43 +10295,39 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Вставити файл"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Файл підпису:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (типово) "
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Підготувати повідомлення"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10148,7 +10335,7 @@ msgstr ""
 "Не вдалося створити вікно редагування:\n"
 "Неможливо активувати керуючий елемент обрання адреси."
 
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10156,9 +10343,10 @@ msgstr ""
 "Не вдалося створити вікно редактора:\n"
 "Неможливо активувати компонент HTML-редактора."
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
+#, fuzzy
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 "<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
@@ -10224,8 +10412,8 @@ msgstr "Тема містить"
 msgid "Subject does not contain"
 msgstr "Тема не містить"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10233,12 +10421,11 @@ msgstr ""
 "Файл з цією назвою вже існує.\n"
 "Переписати його?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Замап'ятайте цей пароль до закінчення поточного сеансу"
 
@@ -10337,149 +10524,99 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "рік"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "років"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "секунд"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "місяць"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "хвилина"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "місяців"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "година"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "тиждень"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "тижнів"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "година"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "місяць"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "хвилина"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "місяців"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "секунд"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "рік"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "років"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Ви забули вибрати дату."
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Ви вибрали невірну дату."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Дату повідомлення буде порівняно або з часом\n"
-"запуску фільтра, або з часом відкриття вірт.\n"
-"теки."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Дату повідомлення буде порівняно з часом\n"
-"який ви тут вказали."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Дату повідомлення буде порівняно з часом\n"
-"відносно запуску фільтру; наприклад \n"
-"\"тиждень тому\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "поточний час"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "час, що ви вкажете"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "час відносно поточного"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Обрати час для порівняння"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Порівняти з"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<клацніть тут для вибору дати>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "зараз"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " тому"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "тому"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " тому"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<клацніть тут для вибору дати>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Обрати час для порівняння"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Правила фільтрування"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Cgek '%s' не існує або не є звичайним файлом."
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Відкрити файл"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Тоді"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Додати дію"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10487,12 +10624,12 @@ msgstr ""
 "Ви забули вказати теку.\n"
 "Будь ласка поверніться та вкажіть теку для доставки пошти."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Вибір теки"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10501,91 +10638,166 @@ msgstr ""
 "Помилка у регулярному виразі \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Важливо"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Робота"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Того"
+
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "після"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Тест"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Необхідно дати назву цьому фільтру."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Назва правила: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Без заголовку"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Якщо"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Виконати дії"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "якщо відповідає всім критеріям"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "якщо відповідає будь-якому критерію"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Додати критерій"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "вхідні"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "вихідні"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Порівняти з"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Редагування фільтрів"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Виправлення віртуальних тек"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Вхідні"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Вихідні"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дату повідомлення буде порівняно з часом\n"
+"який ви тут вказали."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дату повідомлення буде порівняно з часом\n"
+"відносно запуску фільтру; наприклад \n"
+"\"тиждень тому\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дату повідомлення буде порівняно з часом\n"
+"який ви тут вказали."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Віртуальні теки"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "час відносно поточного"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "тому"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "лише вказані теки"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "поточний час"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "час, що ви вкажете"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Джерела вірт.папок"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "з усіма активними віддаленими теками"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "з усіма локальними та активними віддаленими теками"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "з усіма локальними теками"
 
@@ -10613,42 +10825,42 @@ msgid "Beep"
 msgstr "Белем"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Компанія"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "містить"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Дата отримання"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Дата відсилання"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Стерто"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "не містить"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "не закінчується на"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "не існує"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "не існує"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "не схоже на"
@@ -10670,92 +10882,88 @@ msgid "ends with"
 msgstr "закінчується на"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Існують"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "існує"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Вираз"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Важливо"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr " "
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "було перед"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "було після"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Відмічено"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "більше"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "не"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Відмічено"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1734
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Список листування"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Тіло повідомлення"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Заголовок повідомлення"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Відіслати повідомлення за контактом"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Відтворити звук:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Прочитано"
 
@@ -10771,57 +10979,86 @@ msgstr "Відповідність  рег.виразу"
 msgid "Replied to"
 msgstr "Відповісти"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+msgid "returns"
+msgstr ""
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "більше"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "менше"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Підрахунок"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Відправник"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Встановити стан:"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Компанія"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Розмір (КБ)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "схоже на"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Початковий обліковий рахунок"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Особливий заголовок"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "починається на"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Встановити стан:"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Додати правило"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Змінити правило"
 
@@ -10829,11 +11066,11 @@ msgstr "Змінити правило"
 msgid "Score Rules"
 msgstr "Правила підрахунку"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Ви повинні дати назву цій вірт папці."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "Ви повинні вказати хочаб одну теку у якості джерела"
 
@@ -10841,31 +11078,31 @@ msgstr "Ви повинні вказати хочаб одну теку у як�
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution імпортує вашу пошту з Elm"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Імпортування..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Будь ласка, зачекайте"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Імпортування %s як %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканування %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Пошта"
 
@@ -10926,39 +11163,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Смітник"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Файл локальної пошти %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Сканування каталогу"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Початок імпортування"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Параметри"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Редагування фільтрів"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11039,12 +11276,12 @@ msgstr "Фабрика для компонента Mail Summary."
 msgid "Font Preferences"
 msgstr "Без періодичності"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Рахунки"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11092,70 +11329,85 @@ msgstr "Властивості..."
 msgid "Change this folder's properties"
 msgstr "Змінити властивості цієї теки"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 "Деякі ваші налаштування пошти здається пошкоджені, будь ласка перевірте їх."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Ви не вказали метод надсилання пошти"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Увага: змінене повідомлення"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Відіслати повідомлення"
 
-#: mail/component-factory.c:999
+#: mail/component-factory.c:998
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Підготувати повідомлення"
 
-#: mail/component-factory.c:1026
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Наступне повідомлення"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Попереднє повідомлення"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Підготувати повідомлення"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ініціалізувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1035
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Не вдалося ініціалізувати поштовий компонент налаштування Evolutuion."
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Не вдалося ініціалізувати компонент інформації про теку Evolutuion."
 
-#: mail/component-factory.c:1266 mail/component-factory.c:1296
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "З'єднання з сервером..."
 
-#: mail/component-factory.c:1307
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Неможливо зареєструвати сховище за допомогою оболонки"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Властивості для \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Властивості"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
@@ -11205,135 +11457,135 @@ msgstr "%d всього"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Створити віртуальну теку з повідомлення"
 
-#: mail/folder-browser.c:1670
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/folder-browser.c:1671
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/folder-browser.c:1672
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/folder-browser.c:1673
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/folder-browser.c:1677
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/folder-browser.c:1678
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/folder-browser.c:1680 mail/folder-browser.c:2014
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1704 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/folder-browser.c:1705 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/folder-browser.c:1706 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/folder-browser.c:1707
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1712
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/folder-browser.c:1713
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
 #. separator here?
-#: mail/folder-browser.c:1717 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:1718
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/folder-browser.c:1720
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливі"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/folder-browser.c:1729
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1730 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/folder-browser.c:1738
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/folder-browser.c:1742
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/folder-browser.c:1746
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/folder-browser.c:2015
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Віртуальна теку списку листування"
 
-#: mail/folder-browser.c:2017
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Фільтр списку листування (%s)"
 
-#: mail/folder-browser.c:2018
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Віртуальна тека списку листування (%s)"
@@ -11397,76 +11649,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "Ви ще не ввели потрібну інформацію."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Редактор новин Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "Комп'ютер:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "Назва користувача:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "Шлях:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Неможна створювати два облікових рахунки з спільним ім'ям."
 
-#: mail/mail-accounts.c:225
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви впевнені, що хочете стерти цей рахунок?"
 
-#: mail/mail-accounts.c:229
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Не стирати"
 
-#: mail/mail-accounts.c:232
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Справді стерти рахунок?"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: mail/mail-accounts.c:371 mail/mail-accounts.c:405
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-accounts.c:648 mail/mail-accounts.c:652
-msgid "Are you sure you want to delete this news account?"
-msgstr "Ви впевнені, що хочете стерти ці нові рахунки?"
-
-#: mail/mail-accounts.c:747 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: mail/mail-accounts.c:748 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Назва рахунку:"
 
-#: mail/mail-accounts.c:749 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Пуерто Ріко"
@@ -11476,30 +11719,30 @@ msgstr "Пуерто Ріко"
 msgid "Mail to %s"
 msgstr "Пошта до %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема - %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта від %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "Список розсилки %s"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, fuzzy, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11511,7 +11754,7 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11523,7 +11766,7 @@ msgstr ""
 "надсилати або приймати пошту.\n"
 "Бажаєте зробити це зараз?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11531,7 +11774,7 @@ msgstr ""
 "Вам потрібно налаштувати користувача\n"
 "перш ніж ви зможете створити повідомлення."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11540,7 +11783,7 @@ msgstr ""
 "перш ніж ви зможете створити повідомлення."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11548,11 +11791,11 @@ msgstr ""
 "Ви надсилаєте повідомлення у HTML форматі, але наступні одержувачі не "
 "бажають приймати пошту у форматі HTML:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Відіслати у будь-якому разі?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11560,7 +11803,7 @@ msgstr ""
 "Це повідомлення не має теми.\n"
 "Справді відіслати?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11569,11 +11812,11 @@ msgstr ""
 "налаштований приховувати адреси, це повідомлення буде містити тільки "
 "одержувачів прихованої копії."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Це повідомлення містить тільки одержувачів прихованої копії."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11583,17 +11826,11 @@ msgstr ""
 "Apparently-To .\n"
 "Надіслати у будь-якому разі?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Щоб надіслати це повідомлення потрібно вказати отримувачів."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr ""
-"Перед відсиланням цього повідомлення ви повинні налаштувати обліковий "
-"рахунок."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11601,28 +11838,28 @@ msgstr ""
 "Неможливо відкрити теку чернеток цього облікового рахунку.\n"
 "Бажаєте використати типову теку чернеток?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "невідомий відправник"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Перенести повідомлення у"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Скопіювати повідомлення у"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнені, що хочете виправити всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11630,7 +11867,7 @@ msgstr ""
 "Ви можете лише редагувати збережені\n"
 "повідомлення в теці \"Чернетки\"."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11638,39 +11875,39 @@ msgstr ""
 "Ви можете лише відіслати повторно\n"
 "повідомлення з теки \"Відіслані\"."
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Немає вибраних повідомлень"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Показати попереднє повідомлення"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11682,7 +11919,7 @@ msgstr ""
 "\n"
 "Дійсно стерти ці повідомлення?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11691,28 +11928,28 @@ msgstr ""
 "Помилка при завантаженні інформації фільтру:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати повідомлення"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнені, що хочете відкрити всі %d повідомлень у окремих вікнах?"
@@ -11733,7 +11970,7 @@ msgstr "Без опису"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Неназваний контакт"
@@ -11754,10 +11991,11 @@ msgid "Add Signature"
 msgstr "Підпис HTML:"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Будь ласка введіть нижче ваше ім'я та електрону адресу. Поля у "
 "\"Необов'язкова інформація\" можна не заповнювати,\n"
@@ -11765,10 +12003,10 @@ msgstr ""
 "повідомленнями."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Будь ласка введіть інформацію про сервер вхідної пошти. Якщо ви не впевнені, "
 "спитайте вашого системного\n"
@@ -11779,24 +12017,23 @@ msgid "Please select among the following options"
 msgstr "Оберіть серед наступних параметрів"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Введіть спосіб, яким ви будете відсилати ваші повідомлення. Якщо ви не "
 "впевнені, спитайте вашого системного\n"
 "адміністратора або постачальника Інтернет."
 
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Ви майже завершили процес налаштування. Згадані методи надсилання та "
 "отримання пошти\n"
@@ -11805,43 +12042,20 @@ msgstr ""
 "у нижньому полі. Ця назва буде використовуватись тільки для показу."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Асистент з Облікових рахунків Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Робота"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Того"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "після"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Обліковий рахунок %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Перевірка служби"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
@@ -12104,240 +12318,229 @@ msgstr "Зберегти та закрити"
 msgid "Loading Images"
 msgstr "Завантажити зображення"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Повідомлення"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "Показати повідомлення"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "Сервер NNTP:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:79
-msgid "News Servers"
-msgstr "Сервери новин"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Необов'язкова інформація"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 msgid "Or_ganization:"
 msgstr "Ор_ганізація:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Надрукувати вибрані контакти"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Відповідати на:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Параметри отримання"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Необхідна інформація"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Типово"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "Безпечний MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Обрати програму PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Тека надісланих повідомлень:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Надіслані повідомлення та чернетки"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автенфікації"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Конфігурація сервера"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Ярлики"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Джерело"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Вихідна інформація"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Назва стилю:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Перемінна"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12347,205 +12550,201 @@ msgstr ""
 "\n"
 "Щоб піти далі натисніть \"Далі\""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Схід"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Підпис HTML:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "Завжди завантажувати зображення"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "Тип автенфікації: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Підтвердження при викресленні з теки"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Стерти все крім підпису"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Переслати як"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "Повне ім'я:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Назва"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Позначати повідомлення як \"Прочитані\" після"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "Ніколи не завантажувати зображення"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Шлях до програми PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Попереджувати при надсиланні повідомлень з порожньою темою"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Відповісти всім"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Показувати час як"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Файл підпису:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Використовувати безпечне з'єднання (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Перемінна"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "кожні"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " колір"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "newswindow1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12569,206 +12768,216 @@ msgstr "Неможливо створити контекст конверту S/
 msgid "Could not create a S/MIME decode context."
 msgstr "Неможливо створити контекст декодування S/MIME."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Зберегти на диск..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "Вбудований перегляд"
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Вбудований перегляд (через %s)"
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Зовнішня програма перегляду"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Завантажити зображення"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Завантаження вмісту повідомлення"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Запізнілі завдання:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Скопіювати посилання"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Зберегти посилання як"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "долучення %s"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Невірна адреса"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Від"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Відповідати на"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Копія:"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Прих.копія:"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "Поштова програма: "
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Зберегти повідомлення як..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Це повідомлення підписано цифровим підписом. Додаткову інформацію можна "
 "отримати,якщо клацнути на піктограмі із замком."
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Неможливо створити контекст перевірки PGP."
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Це повідомлення підписано цифровим підписом, перевірку ідентичності складено."
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
 "складено."
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Вказівник на сайт FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Вказівник на локальний файл (%s) на сайті \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Вказівник на локальний файл (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Вказівник на віддалені дані (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "Частину external-body сформовано невірно."
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Локальні теки"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Переналаштування теки"
 
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "Неможливо зберегти метаінформацію теки; можливо ви не зможете\n"
 "знову відкрити цю теку: %s: %s"
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не вдалося зберегти метаінформацію теки у: %s: %s"
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Не вдалось стерти метаінформацію теки %s: %s"
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Зміна теки \"%s\" у формат \"%s\" "
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s не можливо переналаштувати бо це не локальна тека"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12776,16 +12985,16 @@ msgstr ""
 "Якщо ви неспроможні відкрити цю поштову скриньку,\n"
 "можливо, ви будете змушені відновити її власноруч."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ви не можете змінювати формат не локальних тек."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Переналаштувати /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12794,7 +13003,7 @@ msgstr ""
 "Помилка під час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12803,7 +13012,7 @@ msgstr ""
 "Помилка під час здійснення операції:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Робота"
 
@@ -12811,100 +13020,100 @@ msgstr "Робота"
 msgid "Filtering Folder"
 msgstr "Фільтрування теки"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Однак, повідомлення було успішно відіслано."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Відсилання \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Виконано."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Відкриття сховища %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12913,7 +13122,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12922,11 +13131,11 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12935,27 +13144,22 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:507
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "Пошук"
 
@@ -13010,32 +13214,42 @@ msgstr "Шлях: %s, Тип: %s"
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Відіслати й отримати пошту"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Скасувати все"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+#, fuzzy
+msgid "_Remember this password"
+msgstr "Запам'ятати цей пароль"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Замап'ятайте цей пароль до закінчення поточного сеансу"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введіть пароль для %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
@@ -13062,7 +13276,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -13106,7 +13320,7 @@ msgstr "Встановлення вірт.теки: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Оновлення вірт.тек для uri: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13119,94 +13333,97 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:266
-#: my-evolution/e-summary-mail.c:737
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Спроба редагувати неіснуючої вірт.теки '%s'"
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Без теми)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "повідомлення - %s"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Декілька непереглянутих повідомлень"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Декілька повідомлень"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -13240,47 +13457,47 @@ msgstr "Отримано"
 msgid "Size"
 msgstr "Розмір"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "Зворотній дзвінок"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Переслати"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Вихідна інформація"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Переслати"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Відповісти"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Відповісти всім"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Перегляд"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13304,16 +13521,16 @@ msgstr "Передплатити теку \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Відмінити передплату на теку \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Тека"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Не було вибрано сервера"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Будь ласка, виберіть сервер."
 
@@ -17805,11 +18022,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23390,8 +23607,8 @@ msgstr "Без опису"
 msgid "Mail summary"
 msgstr "Поштове зведення"
 
-#: my-evolution/e-summary-mail.c:271 my-evolution/e-summary-mail.c:412
-#: my-evolution/e-summary-mail.c:740 shell/e-local-storage.c:1092
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Локальні теки"
 
@@ -23409,15 +23626,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Слово дня на Dictionary.com"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Цитати для"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "Джерело новин"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Введіть URL джерела новин, який бажаєте додати"
 
@@ -23429,25 +23646,25 @@ msgstr "Помилка завантаження RDF"
 msgid "News Feed"
 msgstr "Рядок новин"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 msgid "Add"
 msgstr "Додати"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Вибір:"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Немає завдань"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Без опису)"
 
@@ -24719,7 +24936,8 @@ msgid "Tasks "
 msgstr "Завдання "
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Параметри погоди"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24774,7 +24992,7 @@ msgstr "Показати подробиці"
 msgid "Cancel Operation"
 msgstr "Скасувати операцію"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24787,20 +25005,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Додати теку"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:396
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Вихідні"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Відіслано"
 
@@ -25033,20 +25251,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Створення нової теки"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr "Невірний тип обраної теки для запитаної операції."
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Створити нову теку..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Новий..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Без імені)"
 
@@ -25067,7 +25280,7 @@ msgstr ""
 "Якщо тип вам невідомий, ви можете вибрати \"Автоматично\" та Evolution "
 "намагатиметься його визначити."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Вкажіть інформацію яку бажаєте імпортувати:"
 
@@ -25098,21 +25311,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Вибір теки"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлу %s не існує"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Помилка Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Ви можете імпортувати тільки у локальні теки"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25121,11 +25330,11 @@ msgstr ""
 "Немає імпортеру здатного обробити\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Імпортування"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25134,17 +25343,17 @@ msgstr ""
 "Імпортування %s.\n"
 "Запуск %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Помилка запуску %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Помилка завантаження %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25153,31 +25362,31 @@ msgstr ""
 "Імпортування %s\n"
 "Імпортується елемент 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Імпортувати дані й параметри з старіших програм"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Імпорт одного файла"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25185,24 +25394,24 @@ msgstr ""
 "Будь ласка зачекайте...\n"
 "Йде сканування наявних установок"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтелектуального імпортера"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Від %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Імпорт"
 
@@ -25247,9 +25456,14 @@ msgstr "Відкривання теки \"%s\""
 msgid "in \"%s\" ..."
 msgstr "в \"%s\"..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Не вдалося перейменувати теку: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Неможливо створити вказану теку:\n"
 "%s"
@@ -25268,8 +25482,8 @@ msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 "Не вдається запустити інтерфейс компоненту поштового асистенту Evolutuion.\n"
 
-#: shell/e-shell-user-creatable-items-handler.c:546
-#: shell/e-shell-user-creatable-items-handler.c:598
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Новий"
@@ -25310,51 +25524,52 @@ msgstr "Перейти на теку..."
 msgid "Select the folder that you want to open"
 msgstr "Виберіть теку, яку ви бажаєте відкрити"
 
-#: shell/e-shell-view-menu.c:594 ui/evolution.xml.h:11
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Створити новий ярлик"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Вкажіть теку на яку буде вказувати етикетка:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:62
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:38
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Жодної теки не відображено)"
 
-#: shell/e-shell-view.c:1829
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1831
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Немає)"
 
-#: shell/e-shell-view.c:1878
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для перехіду до "
 "автономної роботи."
 
-#: shell/e-shell-view.c:1885
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution у процесі перехіду до автономної роботи."
 
-#: shell/e-shell-view.c:1891
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25373,12 +25588,12 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/e-shell.c:769
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Неможливо встановити локальне сховище -- %s"
 
-#: shell/e-shell.c:1861
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25389,31 +25604,31 @@ msgstr ""
 "несподівано завершився. Щоб знову отримати доступ до нього вам потрібно\n"
 "закрити та перезавантажити Evolution."
 
-#: shell/e-shell.c:2162
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Невірні аргументи"
 
-#: shell/e-shell.c:2164
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/e-shell.c:2166
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Не знайдено конфіґураційної бази даних"
 
-#: shell/e-shell.c:2168 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Загальна помилка"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Створити нову групу ярликів"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -25422,107 +25637,117 @@ msgstr ""
 "Ви справді бажаєте видалити групу\n"
 "\"%s\" з панелі ярликів?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Перейменувати групу ярликів"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "Перейменувати вибрану групу ярликів на:"
 
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "Малі піктограми"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлики як малі піктограми"
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Великі піктограми"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "Показувати ярлики як великі піктограми"
 
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Створити нову групу ярликів"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Видалити цю групу ярликів"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Перейменувати цю групу..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Перейменувати цю групу ярликів"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Прибрати панель ярликів"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Прибрати панель ярликів"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Створити новий ярлик"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Створити новий ярлик"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Перейменувати ярлик"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Перейменувати вибраний ярлик на:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "Відкрити теку, що зв'язана з цим ярликом"
 
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Відкрити у новому вікні"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Відкрити теку, що зв'язана з цим ярликом, у новому вікні"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Перейменувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Видалити"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Видалити цей ярлик з панелі ярликів"
 
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Помилка збереження ярликів."
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Ярлики"
 
@@ -25530,55 +25755,55 @@ msgstr "Ярлики"
 msgid "Checkbox"
 msgstr ""
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Тека з цією назвою вже існує"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не вірний"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Не вистачає місця для створення теки"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Тека не порожня"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Вказаної теки не знайдено"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Функцію не реалізовано для цього сховища"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Операція не підтримується"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Вказаний тип не підтримується сховищем"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Вказану теку не можна змінити чи видалити"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Неможливо зробити теку підтекою власної підтеки"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Неможливо створити теку з цією назвою"
 
@@ -25633,63 +25858,63 @@ msgstr ""
 "Помилка від системи активації:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1088
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Помилка CORBA"
 
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Перервано"
 
-#: shell/evolution-shell-component.c:1092
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Невірний аргумент"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Вже має власника"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Не має власника"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Не знайдено"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Не підтримуваний тип"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Схема не підтримується"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Операція не підтримується"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Існує"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "Невірний URI"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Має підтеки"
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Не залишилося вільного простору"
 
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Старого власника знищено"
 
@@ -25715,6 +25940,26 @@ msgstr "Комп'ютер"
 msgid "The following connections are currently active:"
 msgstr "Зараз активні наступні з'єднання:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Календар"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Контакти:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Пошта"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Завдання"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Назва теки:"
@@ -25727,6 +25972,34 @@ msgstr "Тип теки:"
 msgid "Specify where to create the folder:"
 msgstr "Вкажіть, де створити теку:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Створити нову теку..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Назва теки:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Назва сервера:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "Назва користувача:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Помічник встановлення Evolution"
@@ -25821,15 +26094,15 @@ msgstr "Більше не запитувати"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution може імпортувати дані з таких файлів:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution завершує роботу..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25849,53 +26122,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Більше не запитувати"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "Вимкнути заставку"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Початок імпортування"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Запуск інтелектуального імпортера"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Записувати інформацію налагодження всіх компонентів у файл."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ініціалізувати компонентну систему Bonobo."
 
@@ -25932,116 +26205,110 @@ msgstr "Скопіювати вибране"
 msgid "Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Створити новий контакт"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Створити новий контактний список"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Вирізати вибране"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Стерти вибрані контакти"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Перенести вибрані повідомлення у іншу теку"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Вставити буфер обміну"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Переглянути контакти, що буде надруковано"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Перегляд друку"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "Надрукувати вибрані контакти"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Зберегти вибраний контакт як vCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Вибрати все"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Вибрати всі контакти"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Надіслати повідомлення до обраних контактів."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Відіслати вибрані контакти іншій особі."
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Зупинити завантаження"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "поточний час"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:41
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "Дії"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "Контактний список"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "Переслати контакт..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "Пошук контактів"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Вибрати все"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "Відіслати повідомлення за контактом..."
@@ -26086,11 +26353,6 @@ msgstr "Місяць"
 msgid "Previews the calendar to be printed"
 msgstr "Переглянути календар, що буде надруковано"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Перегляд друку"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "Надрукувати цей календар"
@@ -26148,8 +26410,8 @@ msgstr "Переглянути елементи, що буде надруков�
 msgid "Print this item"
 msgstr "Надрукувати цей елемент"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Зберегти"
 
@@ -26174,9 +26436,9 @@ msgstr "Зберегти цей елемент на диску"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:45
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "Файл"
 
@@ -26186,7 +26448,7 @@ msgstr "Надрукувати конверт..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Зберегти як..."
 
@@ -26200,8 +26462,8 @@ msgstr "Відіслати повідомлення за контактом..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "Зберегти"
 
@@ -26298,26 +26560,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Остаточно видалити всі стерті повідомлення з усіх тек"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Скласти нове повідомлення"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Збереження повідомлення у теці"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Показати вікно попереднього перегляду повідомлення"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Передплата на теки на віддалених серверах"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Редактор віртуальних тек..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "Фільтри..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "панель перегляду"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Передплатити теки..."
 
@@ -26415,7 +26687,7 @@ msgstr "Розбитий на гілки список повідомлень"
 msgid "_Expunge"
 msgstr "Викреслити"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:46
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "Тека"
 
@@ -26677,165 +26949,180 @@ msgstr "Попереднє непрочитане повідомлення"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Відповідь по завданню"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Перевіряти нову пошту в усіх теках"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Попереднє важливе повідомлення"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Переглянути повідомлення, що буде надруковано"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Попереднє"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Надрукувати це повідомлення"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Переслати вибране повідомлення до когось"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Повернути оригінальний розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Пошук повідомлення..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "Менше"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Зберегти повідомлення як текстовий файл"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Шукати у тексті відображеного повідомлення"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Налаштування сторінки для вашого поточного принтера"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Показувати повні заголовки"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Показати повні заголовки"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Показати повідомлення у звичайному стилі"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Показати повідомлення з поштовими заголовками"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Показати повний вигідний текст повідомлення"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Розмір тексту"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Відновити вибрані повідомлення"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "Віртуальна тека за списком листування..."
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "Віртуальна тека за відправником..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "Віртуальна тека за отримувачами..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "Віртуальна тека за темою..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Долучити"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "Скопіювати у теку"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "Створити фільтр з повідомлення"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Переслати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Перейти"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "В тілі"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "Більше"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "Показати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "Перенести в теку"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Наступне повідомлення"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Звичайне відображення"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "Відкрити повідомлення"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Попереднє повідомлення"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Процитовано"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:60
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Перейменувати..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "Інструменти"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "Відновити"
 
@@ -26844,14 +27131,14 @@ msgid "Close this window"
 msgstr "Закрити це вікно"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "Закрити"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:61
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "Вид"
 
@@ -26879,169 +27166,161 @@ msgstr "Зашифрувати це повідомлення вашим серт
 msgid "For_mat"
 msgstr "Формат"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "Вставити текстовий файл..."
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Вставити файл як текст у повідомлення"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Вставити текстовий файл..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Відкрити"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Відкрити файл"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Підпис PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Шифрування S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Підпис S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Зберегти як"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Зберегти чернетку"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Зберегти в теці..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Зберегти поточний файл"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Зберегти поточний файл з іншою назвою"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Зберегти повідомлення у вказаній теці"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Відправити"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Відправити пізніше"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Відправити пізніше"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Відіслати пошту в форматі HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Відіслати повідомлення пізніше"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Надіслати це повідомлення негайно"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Показати / прибрати долучення"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Підписати це повідомлення вашим ключем PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Підписати це повідомлення вашим сертифікатом підпису S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Перемикнути стан показу поля прихованої копії"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Перемикнути стан показу поля копії"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Перемикнути стан показу поля \"Від\""
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Перемикнути стан показу поля \"Відповідь\""
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "Долучення..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Поле прихованої копії"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Поле копії"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "Стерти все"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Поле \"Від\""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "Вставити"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "Відкрити..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Поле \"Відповідь\""
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:49
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Зберегти елемент і закрити діалогове вікно"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "Довідка"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Файл підпису:"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Додати теку до вашого списку переплачених тек"
@@ -27163,6 +27442,10 @@ msgstr "Створити посилання на цю теку в панелі �
 msgid "Create a new folder"
 msgstr "Створити нову теку"
 
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Створити новий ярлик"
+
 #: ui/evolution.xml.h:12
 #, fuzzy
 msgid "Create a new window displaying this folder"
@@ -27214,115 +27497,122 @@ msgid "Open this folder in an other window"
 msgstr "Відкрити цю теку в новому вікні"
 
 #: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Установки пілота..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Відіслати повідомлення з черги та отримати нові"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Конфігурація пошти"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Показати інформацію про Ximian Evolution"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Підготувати звіт про помилку"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "Відіслати звіт про помилку"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Відіслати звіт про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Перемикнути"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панелі тек"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Перемикнути стан показу панелі ярликів"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Перемикнути стан роботи на лінії"
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Часті запитання щодо Ximian Evolution"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "Про Ximian Evolution..."
 
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "Скопіювати..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "Тека"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "Імпорт..."
 
-#: ui/evolution.xml.h:51
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "Перенести..."
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "Новий"
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:54
-msgid "_Pilot Settings..."
-msgstr "Установки пілота..."
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:56
 msgid "_Preferences..."
 msgstr "_Вподобання..."
 
-#: ui/evolution.xml.h:56
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "Перейменувати..."
 
-#: ui/evolution.xml.h:57
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:58
-msgid "_Shortcut"
-msgstr "Ярлик"
-
 #: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Панель ярликів"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "Ярлик"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "Надрукувати зведення"
@@ -27336,17 +27626,40 @@ msgid "Reload the view"
 msgstr "Перезавантажити вигляд"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Адресні картки"
+#, fuzzy
+msgid "By _Company"
+msgstr "За компанією"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "За компанією"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Адресні картки"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Список телефонів"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Показ тижня"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Перегляд доби"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Показ місяця"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Показ робочого тижня"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27372,13 +27685,19 @@ msgstr "За темою"
 msgid "Messages"
 msgstr "Повідомлення"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "З категорією"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "Завдання"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27531,11 +27850,11 @@ msgstr "Кодування символів"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Редактор пошуків"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Зберегти пошук"
 
@@ -27575,20 +27894,20 @@ msgstr "Повідомлення"
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Знайти зараз"
 
-#: widgets/misc/e-search-bar.c:514
+#: widgets/misc/e-search-bar.c:520
 msgid "_Clear"
 msgstr "О_чистити"
 
-#: widgets/misc/e-search-bar.c:876
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Очистити"
 
-#: widgets/misc/e-search-bar.c:878
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Знайти зараз"
 
@@ -27602,14 +27921,160 @@ msgstr "Персональний сервер адресної книги"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Персональний календарний сервер; календарна фабрика"
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): не вдалось ініціалізувати GNOME-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): не вдалось ініціалізувати GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ініціалізувати Bonobo"
+
+#~ msgid "&lt;- _Remove"
+#~ msgstr "&lt;- _Видалити"
+
+#~ msgid "_Add -&gt;"
+#~ msgstr "_Додати -&gt;"
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution неспроможній отримати локальну книгу адрес.\n"
+#~ "Це може бути спричинено аварійним завершенням компонента книги адрес.\n"
+#~ "Щоб допомогти розробникам швидше знайти та вирішити проблему,\n"
+#~ "будь ласка надішліть лист з детальним описом обставин виникнення помилки\n"
+#~ "за адресою Jon Trowbridge <trow@ximian.com>. Дякуємо вам."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution неспроможній отримати локальну книгу адрес.\n"
+#~ "У звичайних обставинах це ніколи не трапляється.\n"
+#~ "Необхідно закрити Evolution та запустити його знову."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "Перенести..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Стан засідання змінився. Надіслати оновлену версію?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "Стерти цю зустріч"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Помилка вводу/виводу"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Помилка стадії під'єднання: %s: можливо не фатально"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Перевищено час очікування відповіді на HELO: %s: не фатально"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Помилка відповіді на HELO: %s: не фатально"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "затримка відповіді на QUIT: %s: не фатально"
+
+#~ msgid "Insert File"
+#~ msgstr "Вставити файл"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Ви вибрали невірну дату."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Дату повідомлення буде порівняно або з часом\n"
+#~ "запуску фільтра, або з часом відкриття вірт.\n"
+#~ "теки."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Редактор новин Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Ви впевнені, що хочете стерти ці нові рахунки?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr ""
+#~ "Перед відсиланням цього повідомлення ви повинні налаштувати обліковий "
+#~ "рахунок."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "Сервер NNTP:"
+
+#~ msgid "News Servers"
+#~ msgstr "Сервери новин"
+
+#~ msgid "Source"
+#~ msgstr "Джерело"
+
+#~ msgid "Source Information"
+#~ msgstr "Вихідна інформація"
+
+#~ msgid "newswindow1"
+#~ msgstr "newswindow1"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Зберегти на диск..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Зберегти повідомлення як..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Створення нової теки"
+
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr "Невірний тип обраної теки для запитаної операції."
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Ви можете імпортувати тільки у локальні теки"
+
+#~ msgid "Create new contact"
+#~ msgstr "Створити новий контакт"
+
+#~ msgid "Create new contact list"
+#~ msgstr "Створити новий контактний список"
+
+#~ msgid "_Contact List"
+#~ msgstr "Контактний список"
+
+#~ msgid "Inline Text _File..."
+#~ msgstr "Вставити текстовий файл..."
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Вставити файл як текст у повідомлення"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Вставити текстовий файл..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Відправити пізніше"
+
+#~ msgid "Send _later"
+#~ msgstr "Відправити пізніше"
+
+#~ msgid "Send the message later"
+#~ msgstr "Відіслати повідомлення пізніше"
+
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Установки пілота..."
diff --git a/po/vi.po b/po/vi.po
index efa7ffe511..cdb39124f7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-05-09 23:50-0400\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -34,7 +34,7 @@ msgstr "Nhập tập tin VCard vào Evolution."
 msgid "File As"
 msgstr "Tập tin là"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Tên"
@@ -342,46 +342,46 @@ msgstr "VCard cho %s"
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "Đang tìm..."
 
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "Đang nạp..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "Lỗi trong biểu thức tìm kiếm"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "Đang thêm card vào LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "Đang loại bỏ card khỏi LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "Đang sửa card trong LDAP server..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "Khởi động lại tìm kiếm."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "Đang nhận kết quả tìm kiếm LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "Lỗi khi loại bỏ card"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "Không thể phân tích URL `%s'"
@@ -473,11 +473,11 @@ msgid "This page can be used to configure access to LDAP directory servers"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "Liên lạc"
 
@@ -493,23 +493,32 @@ msgstr "LDAP Server"
 msgid "LDAP server containing contact information"
 msgstr "LDAP server chứa thông tin liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "Liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "_Liên lạc"
+
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Tạo liên lạc mới"
+
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "_Danh sách liên lạc"
 
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "Liên lạc mới"
-
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "_Liên lạc"
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Tạo danh sách liên lạc mới"
 
 #: addressbook/gui/component/addressbook-config.c:197
 #, fuzzy
@@ -532,29 +541,29 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(Phiên bản Evolution này chưa hỗ trợ SSL)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Không thể khởi động gnome-vfs"
 
@@ -562,11 +571,11 @@ msgstr "Không thể khởi động gnome-vfs"
 msgid "Other Contacts"
 msgstr "Liên lạc khác"
 
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "Không thể mở sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -575,7 +584,7 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã nhập sai URI, "
 "hoặc là do LDAP server không hoạt động."
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -587,7 +596,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:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -595,44 +604,44 @@ 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:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Nhập mật khẩu cho %s (người dùng %s)"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "kết thúc bằng"
 
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "Email 2"
 
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI sẽ được Bộ duyệt thư mục hiển thị"
 
@@ -753,7 +762,7 @@ msgstr ""
 msgid "Addressbook Sources"
 msgstr "Nguồn sổ địa chỉ"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -847,8 +856,8 @@ msgstr "Cấu hình"
 msgid "Mappings"
 msgstr "Biên"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "_mỗi"
@@ -900,8 +909,8 @@ msgstr "_Phạm vị tìm: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "Đang tìm"
 
@@ -1092,15 +1101,15 @@ msgid "Using email address"
 msgstr "Đây là địa chỉ gửi _mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Thêm"
 
@@ -1146,12 +1155,12 @@ msgstr ""
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Sửa"
@@ -1266,10 +1275,10 @@ msgstr ""
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "Loại bỏ"
 
@@ -1298,42 +1307,15 @@ msgstr "(%d không hiện)"
 msgid "Unnamed Contact"
 msgstr "Liên lạc vô danh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "Chọn liên lạc từ sổ địa chỉ"
+
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "Người gửi chứa"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution không thể lấy sổ địa chỉ cục bộ.\n"
-"Có lẽ do thành phần evolution-addressbook bị hỏng.\n"
-"Để giúp chúng tôi hiểu và giải quyết tốt hơn vấn đề này,\n"
-"vui lòng gửi email cho Jon Trowbridge <trow@ximian.com> với \n"
-"mô tả chi tiết về trường hợp xảy ra lỗi. Cám ơn bạn."
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution không thể lấy sổ địa chỉ cục bộ.\n"
-"Trong điều kiện bình thường, điều này không xảy ra.\n"
-"Có lẽ bạn cần thoát và khởi động lại Evolution để \n"
-"khắc phục sự cố."
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "Chọn liên lạc từ sổ địa chỉ"
-
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
 msgstr "Chọn tên"
@@ -1355,15 +1337,10 @@ msgid ""
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "_Di chuyển..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Category:"
 msgstr "_Phân loại:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "_thư mục:"
 
@@ -1466,11 +1443,12 @@ msgstr "Muốn nhậm _HTML mail"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "_Xóa"
 
@@ -2707,7 +2685,7 @@ msgid "_Hide addresses when sending mail to this list"
 msgstr "Ẩ_n địa chỉ này khi gửi mail tới danh sách"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
@@ -2770,7 +2748,7 @@ msgstr ""
 "Bạn có muốn thêm nữa không?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
@@ -2798,21 +2776,21 @@ msgid "Error getting book view"
 msgstr "Lỗi khởi động %s"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "Lỗi khi sửa đổi card"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "Thành công"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
@@ -2820,8 +2798,8 @@ msgstr "Lỗi lại"
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
@@ -2838,7 +2816,7 @@ msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2861,48 +2839,53 @@ msgid "TLS not Available"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "Tập tin %s không tồn tại"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Bạn có muốn lưu các thay đổi không?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "Lỗi khi thêm danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "Lỗi khi thêm card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "Lỗi khi sửa đổi danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "Lỗi khi loại bỏ danh sách"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "Lỗi khi loại bỏ card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "Hiển thị"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "Hiển thị"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -2910,22 +2893,22 @@ msgid ""
 "displayed on your screen. Do you really want to display all of these cards?"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "Monte Scuro"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "Sao chép công việc được chọn"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "Không có card"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "Không có card"
@@ -2998,7 +2981,7 @@ msgstr "Sổ địa chỉ"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lưu là VCard"
 
@@ -3038,7 +3021,7 @@ msgid "Pilot Settings..."
 msgstr "Thiết lập thư..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
@@ -3047,8 +3030,8 @@ msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "In"
@@ -3068,7 +3051,7 @@ msgid "Move to folder..."
 msgstr "_Chuyển tới thư mục..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
@@ -3079,20 +3062,20 @@ msgid "Copy"
 msgstr "Sao chép"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Xoá"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "_Khung xem hiện thời"
@@ -3249,7 +3232,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:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "Tùy chọn"
 
@@ -3339,26 +3322,26 @@ msgstr "Cuộc hẹn không tên"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "Cao"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "Bình thường"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "Thấp"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "Chưa biết"
@@ -3478,11 +3461,11 @@ msgstr "Thời gian ngủ (phút)"
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3490,13 +3473,13 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3507,7 +3490,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi lần nữa"
@@ -3536,7 +3519,7 @@ msgstr "Mô tả chứa"
 msgid "Comment contains"
 msgstr "Ghi chú chứa"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "Không khớp"
 
@@ -3547,7 +3530,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3569,18 +3552,18 @@ msgstr "%d %B %Y"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Không thể tạo khung xem lịch. Vui lòng kiểm tra thiết lập ORBit và OAF."
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "Riêng tư"
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "Tin tưởng"
@@ -3605,37 +3588,37 @@ msgstr "Đ"
 msgid "W"
 msgstr "T"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Rảnh"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "Bận"
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "Đang làm"
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Hoàn tất"
 
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3646,56 +3629,55 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "Đệ quy"
 
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "Đã gán"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "Có"
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "Không"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "Khung ngày"
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "Khung tuần làm việc"
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "Khung tuần"
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "Khung tháng"
 
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "Lịch"
 
@@ -3703,12 +3685,12 @@ msgstr "Lịch"
 msgid "Folder containing appointments and events"
 msgstr "Thư mục chứa các cuộc hẹn và sự kiện"
 
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Công việc"
 
@@ -3716,44 +3698,62 @@ msgstr "Công việc"
 msgid "Folder containing to-do items"
 msgstr "Thư mục chứa các mục to-do"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "Cuộc hẹn mới"
+
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "Cuộc hẹn"
+
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "Tạo cuộc hẹn mới"
+
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "Tạo công việc mới"
+
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "Tạo công việc mới"
+
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Cuộc _hẹn mới"
 
-#: calendar/gui/component-factory.c:716
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "New appointment"
-msgstr "Cuộc hẹn mới"
-
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "_Appointment"
-msgstr "Cuộc hẹn"
+msgid "Create a new all-day appointment"
+msgstr "Tạo cuộc hẹn mới"
 
 #: calendar/gui/control-factory.c:123
 #, fuzzy, c-format
@@ -3820,7 +3820,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "Với tham số này:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "ngày"
 
@@ -3828,11 +3829,13 @@ msgstr "ngày"
 msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "phút"
 
@@ -3960,7 +3963,7 @@ msgstr "Bộ nhắc nhở"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -3989,7 +3992,7 @@ msgstr "kết thúc cuộc hẹn"
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "phút"
 
@@ -4167,7 +4170,7 @@ msgid "_Fri"
 msgstr "_Sáu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "_Chung"
 
@@ -4212,19 +4215,33 @@ msgstr "_Tư"
 msgid "before every appointment"
 msgstr "trước khi bắt đầu cuộc hẹn"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "Trạng thái cuộc họp đã thay đổi. Gửi phiên bản cập nhật?"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
 
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Bạn có chắc muốn hủy bỏ và xóa công việc này?"
 
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Bạn có chắc muốn hủy bỏ và xóa mục nhật ký này?"
 
@@ -4296,61 +4313,61 @@ msgstr " (Đến hạn "
 msgid "Due "
 msgstr "Đến hạn "
 
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Không thể cập nhật đối tượng!"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng!"
 
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
@@ -4549,7 +4566,7 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4561,7 +4578,7 @@ msgstr "Vai trò"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
@@ -4646,7 +4663,7 @@ msgstr "lúc"
 msgid "first"
 msgstr "Sương mù"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "giây"
 
@@ -4670,7 +4687,7 @@ msgstr "danh sách"
 msgid "Other Date"
 msgstr "Fax khác"
 
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "ngày"
 
@@ -4770,20 +4787,26 @@ msgstr "% hoàn tất"
 msgid "Date Completed:"
 msgstr "Ngày hoàn thành:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "Cần hành động"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "Tiến trình"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "Độ ư_u tiên:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "_Trạng thái:"
 
@@ -4797,7 +4820,7 @@ msgstr "Cơ bản"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4866,80 +4889,80 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Mở"
 
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Cắt"
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Gán công việc"
 
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Đang nạp lịch"
 
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh dấu công _việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Nhấn để thêm công việc"
@@ -4948,8 +4971,8 @@ msgstr "Nhấn để thêm công việc"
 msgid "Alarms"
 msgstr "Báo động"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "Hoàn tất"
 
@@ -4977,11 +5000,9 @@ msgstr "Độ ưu tiên"
 msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "Tóm tắt"
 
@@ -5023,110 +5044,109 @@ 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "Cuộc _hẹn mới"
 
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "In..."
 
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "Cấu hình"
 
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "Cấu hình"
 
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Lư_u là..."
 
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp"
 
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển tiếp liên lạc..."
 
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Lỗi thực hiện %s."
@@ -5167,7 +5187,7 @@ msgstr "Công việc hoàn tất: <b>"
 msgid "Task Due: <b>"
 msgstr "Công việc đến hạn: <b>"
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
@@ -5176,335 +5196,340 @@ msgstr "Thông tin iCalendar"
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "Đị_a điểm"
+
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "_Trạng thái:"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Có thể làm"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Lạ"
 
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "Không thể cập nhật tập tin lịch!\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Chọn thư mục"
 
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Chọn thư mục"
@@ -5550,7 +5575,7 @@ msgstr "ngày bắt đầu"
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "Người tham dự yêu cầu"
 
@@ -5563,57 +5588,52 @@ msgid "Non-Participants"
 msgstr "Người không tham dự"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "Cá nhân"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "Nhóm"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "Tài nguyên"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "Phòng"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "Ghế"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "Người tham dự yêu cầu"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "Người tham dự không yêu cầu"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "Người không tham dự"
 
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "Cần hành động"
-
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Có thể làm"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "Ủy nhiệm"
 
@@ -5703,49 +5723,46 @@ msgstr "Lúc _bắt đầu cuộc họp:"
 msgid "Meeting _end time:"
 msgstr "Lúc _kết thúc cuộc họp:"
 
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Không thể nập những công việc trong `%s'"
 
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để nạp `%s'"
 
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Không thể mở thư mục trong `%s'"
 
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Ngày hoàn tất"
 
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "Đang bỏ thư mục"
 
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "_Xoá cuộc hẹn"
-
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -5756,11 +5773,16 @@ msgstr "Không thể mở thư mục trong `%s'"
 msgid "The method required to open `%s' is not supported"
 msgstr "Chưa hỗ trợ phương thức yêu cầu để mở `%s'"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Đang mở lịch tại %s"
 
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "Đang mở thư mục %s"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Tháng Tư"
@@ -5817,53 +5839,58 @@ msgstr "Tháng Mười"
 msgid "September"
 msgstr "Tháng Chín"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "Phải chọn một tổ chức."
 
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "Thông tin sự kiện"
 
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "Thông tin nhật ký"
 
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "Thông tin rảnh/bận"
 
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "Thông tin lịch"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "Cập nhật"
 
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "Cập nhật danh sách"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người tham dự sự kiện."
 
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "Không thể khởi động Bonobo"
+
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr ""
 
@@ -6090,9 +6117,8 @@ msgid "Print Calendar"
 msgstr "In lịch"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
@@ -6127,8 +6153,8 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa"
 
@@ -6184,17 +6210,29 @@ msgstr "Nhập tập tin VCard vào Evolution."
 msgid "Imports vCalendar files into Evolution"
 msgstr "Nhập tập tin VCard vào Evolution."
 
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "Không thể kết nối tới kho: %s"
+
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "Thông điệp lịch"
 
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -6203,95 +6241,95 @@ 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?"
 
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "Lịch"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now không cần đối số"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time cần 1 đối số"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time cần một đối số (là chuỗi)"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time cần đối số thứ nhất (là chuỗi thời gian theo ISO 8601)"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day cần 2 đối số"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "tine-add-dau cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day cần đối số thứ hai là số nguyên"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin cần một đối số"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end cần một đối số"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype không cần đối số"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? cần 2 đối số"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? cần đối số một là time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? cần đối số thứ hai là time_t"
 
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains cần hai đối số"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? cần đối số thứ hai là chuỗi"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? cần đối số thứ hai là chuỗi"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 "contains? cần đối số thứ nhất là \"bất kỳ\", \"tóm tắt\", hoặc \"mô tả\""
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? cần ít nhất một đối số"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -6299,19 +6337,19 @@ msgstr ""
 "has-categories? cần mọi đối số đều là chuỗi và hoặc chỉ có một đối số và đối "
 "số đó là boolean sai (#f)"
 
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? không cần đối số"
 
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? cần một đối số"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? cần đối số thứ nhất là time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "Định lượng biểu thức tìm kiếm không trả về giá trị boolean"
 
@@ -7908,72 +7946,82 @@ msgstr "Đang lưu thư mục %s"
 msgid "You must be working online to complete this operation"
 msgstr "Bạn phải đang hoạt động trực tuyến mới có thể hoàn tất thao tác này."
 
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "Đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Lỗi phân tích bộ lọc: %s: %s"
 
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Lỗi thực hiện bộ lọc: %s: %s"
 
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Đang lấy thông diệp %d (%d%%)"
 
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "Không thể mở thông điệp"
 
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Đang lấy thông điệp %d trên %d"
 
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
 
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "Lỗi giải mã thông điệp."
 
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "Đối số không hợp lệ"
+
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "Đối số không hợp lệ"
+
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Lỗi thông điệp cache %s: %s"
 
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Lỗi thông điệp cache %s: %s"
 
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
@@ -8029,7 +8077,7 @@ msgstr "Đang di chuyển thông điệp"
 msgid "Copying messages"
 msgstr "Đang chép thông điệp vào %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8037,47 +8085,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Tín hiệu trả lời không mong đợi từ POP server: %s"
 
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "Chưa có tên tập tin."
 
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Không thể mã hóa thông điệp: chưa xác định người nhận"
 
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8085,18 +8133,18 @@ msgid ""
 "%.*s"
 msgstr "Lỗi thông điệp cache %s: %s"
 
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Lỗi thông điệp cache %s: %s"
 
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Lỗi giải mã thông điệp."
 
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Không thể xác minh thông điệp: không thể tạo tập tin tạm: %s"
@@ -8122,22 +8170,22 @@ msgid "Could not lock '%s'"
 msgstr "Không thể khóa '%s'"
 
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Không thể tạo tập tin khóa cho %s: %s"
 
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Quá hạn thử lấy tập tin khóa trên %s. Sẽ thử lại sau."
 
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Lỗi lấy khóa bằng fcntl(2): %s"
 
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Lỗi lấy khóa bằng flock(2): %s"
@@ -8196,11 +8244,15 @@ msgstr "Lỗi ghi tập tin mail tạm: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Lỗi sao chép tập tin mail tạm: %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -8333,7 +8385,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "Trả lời chứng thực từ server sai."
 
@@ -8507,31 +8559,130 @@ msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết
 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-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "Lỗi xác minh chứng nhận."
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "Lỗi xác minh chứng nhận."
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
-"Chứng nhận sai từ %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "Không thể lưu tập tin chữ ký."
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "Lỗi nạp %s"
+
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "Không chính thức"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "Lỗi xác minh chứng nhận."
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate Revoked"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Đối số không hợp lệ"
+
+#: camel/camel-tcp-stream-openssl.c:613
+msgid "Certificate untrusted"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate rejected"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8540,16 +8691,33 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr ""
 
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"Chứng nhận sai từ %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Bạn có muốn chấp nhận dù bất cứ giá nào?"
+
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8569,32 +8737,37 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Không thể phân tích URL `%s'"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "Lỗi khởi động %s"
+
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Không có thông điệp %s trong %s"
 
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, 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-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, 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:310
+#: camel/camel-vee-store.c:332
 #, 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:318
+#: camel/camel-vee-store.c:340
 #, 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"
@@ -8602,12 +8775,12 @@ msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -8636,40 +8809,40 @@ msgstr "Tín hiệu trả lời của IMAP server không chứa thông tin %s"
 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"
 
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Không thể tạo thư mục %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 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:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "Thư mục đã bị hủy và tạo lại trên server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 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:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 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:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 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:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "Đang quét tìm thông điệp mới"
 
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 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"
 
@@ -8678,10 +8851,10 @@ msgstr "Không thể tìm thấy phần thân thông điệp trong tín hiệu t
 msgid "Could not open cache directory: %s"
 msgstr "Không thể mở thư mục cache: %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Lỗi thông điệp cache %s: %s"
@@ -8694,7 +8867,7 @@ msgstr "Kiểm tra tìm thư mới"
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "Thư mục"
 
@@ -8726,7 +8899,7 @@ msgstr "Để đọc và lưu thư trên IMAP server."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -8735,73 +8908,77 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
 
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "dịch vụ %s cho %s trên %s"
 
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Kết nối bị hủy bỏ"
 
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Không thể kết nối tới %s (cổng %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Lỗi gửi tên người dùng: %s"
 
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Chứng thực thất bại."
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "Thư mục không rỗng"
+
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s không hỗ trợ loại chứng thực được yêu cầu %s"
 
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Không hỗ trợ loại chứng thực %s"
 
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, 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:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 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:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -8812,31 +8989,37 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "Tên thư mục không thể chứa ký tự Enter"
+
+#: camel/providers/imap/camel-imap-store.c:1788
 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"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Không thể mở hộp thư: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -8858,7 +9041,10 @@ msgid "Local delivery"
 msgstr "Gửi cục bộ"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Để nhận thư cục bộ từ spool dạng mbox."
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -8886,12 +9072,12 @@ msgstr "Spool mbox Unix chuẩn"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "Để đọc và lưu thư cục bộ trong tập tin mbox chuẩn."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -8902,38 +9088,38 @@ msgstr ""
 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, 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:185
+#: camel/providers/local/camel-local-store.c:186
 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:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "Tập tin mail cục bộ %s"
 
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, 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:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên thư mục: %s"
 
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, 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:389
+#: camel/providers/local/camel-local-store.c:390
 #, 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"
@@ -8993,7 +9179,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -9031,26 +9217,26 @@ msgstr "không phải là thư mục dạng Maildir"
 msgid "Could not scan folder `%s': %s"
 msgstr "Không thể quét thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Không thể mở đường dẫn thư mục dang Maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "Kiểm tra tìm thư mới"
 
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "Đang quét tìm thông điệp mới"
 
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Đang lưu thư mục"
@@ -9094,7 +9280,7 @@ 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:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9103,7 +9289,7 @@ msgstr ""
 "Không thể mở tập tin `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9112,14 +9298,14 @@ msgstr ""
 "Không thể tạp tập tin `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, 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:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9128,7 +9314,7 @@ msgstr ""
 "Không thể xóa thư mục `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
@@ -9143,64 +9329,64 @@ msgstr "Không thể mở thư mục: %s: %s"
 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:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, 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:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, 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:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, 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:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, 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:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, 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:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, 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:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 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:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Lỗi lạ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Không thể đổi tên thư mục: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, 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:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Lỗi ghi vào hộp thư tmp: %s: %s"
@@ -9350,50 +9536,50 @@ msgstr "Bỏ"
 msgid "Operation failed: %s"
 msgstr "Thao tác bị hủy bỏ"
 
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "Đang nhậm tóm tắt POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "Đang bỏ các thông điệp cần xóa "
 
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "Không có thông điệp nào vời UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Đang nhận thông điệp POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
 "Không thể lấy thông điệp: %s\n"
 "  %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Lỗi lại"
@@ -9411,7 +9597,7 @@ msgstr "Xóa thông điệp khỏi server"
 msgid "Delete after %s day(s)"
 msgstr "Xoá sau %s ngày"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -9437,6 +9623,11 @@ msgstr ""
 "giao thức APOP. Có thể sẽ không hoạt động cho mọi người dùng, kể cả trên "
 "server tuyên bố có hỗ trợ."
 
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "Không thể kết nối tới %s (cổng %d): %s"
+
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
 #: camel/providers/pop3/camel-pop3-store.c:253
@@ -9448,54 +9639,56 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "Không thể kết nối tới POP server trên %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Không hỗ trợ cơ chế chứng thực yêu cầu."
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "Lỗi I/O"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "Không thể chứng thực KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu PỎP cho %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Lỗi gửi mật khẩu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 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:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9521,35 +9714,35 @@ msgstr "Không thể tạo ống dẫn tới sendmail: %s: chưa gửi mail"
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Không thể tạo tiến trình sendmail mới: %s: chưa gửi mail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Không thể gửi thông điệp: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "Sendmail đã thoát với tín hiệu %s: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Không thể thực hiện %s: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "Sendmail đã thoát với trạng thái %d: chưa gửi mail."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9657,45 +9850,45 @@ msgstr "Lỗi chứng thực tạm"
 msgid "Authentication required"
 msgstr "Yêu cầu chứng thực"
 
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Lỗi trả lời chào mừng: %s: có lẽ không phải lỗi chết người"
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Không thể kết nối tới POP server.\n"
 "Lỗi gửi tên người dùng: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP server %s không hỗ trợ loại chứng thực yêu cầu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9706,90 +9899,90 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Gửi thư (SMTP) thông qua %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 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:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "Yêu cầu HELO quá hạn: %s: không nghiêm trọng"
-
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "Lỗi trả lời HELO: %s: không nghiêm trọng"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "Lỗi trả lời RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "Chứng thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng chứng thực SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "Yêu cầu AUTH thất bại."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời chứng thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "Lỗi yêu cầu MAIL FROM: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu RCPT TO: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
@@ -9797,90 +9990,90 @@ msgstr "Quá hạn yêu cầu DATA: %s: chưa gửi mail"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "Quá hạn gửi DATA: chấm dứt thông điệp: %s: chưa gửi mail"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "Trả lời chứng thực từ server sai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Quá hạn yêu cầu RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "Lỗi trả lời RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "Quá hạn yêu cầu QUIT: %s: không nghiêm trọng"
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "Yêu cầu AUTH quá hạn: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "Lỗi trả lời RSET: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 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:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Không thể đính kèm tập tin %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Không thể đính kèm tập tin %s: không phải tập tin bình thường"
@@ -9898,56 +10091,60 @@ msgid "MIME type:"
 msgstr "Kiểu MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "Đề nghị tự động hiển thị đồ đính kèm"
 
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "Nhấn vào đây để xem sổ địa chỉ"
 
 #.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "Từ:"
-
-#.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "Trả lời cho:"
 
 #.
-#. * Subject:
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "Từ:"
+
+#.
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "Chủ đề:"
 
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "Tới:"
 
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "Nhập người nhận thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "CC:"
 
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Nhập địa chỉ sẽ nhận một bản sao của thông điệp"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9955,17 +10152,25 @@ msgstr ""
 "Nhập địa chỉ sẽ nhận một bản sao của thông điệp mà không xuất hiện tên trong "
 "danh sách người nhận."
 
-#: composer/e-msg-composer-select-file.c:267
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Đính kèm tập tin"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Không thể lưu tập tin chữ ký."
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -9974,41 +10179,41 @@ msgstr ""
 "Lỗi đọc tập tin %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "Cảnh báo!"
 
-#: composer/e-msg-composer.c:1030
+#: 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:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Lỗi lưu tập tin: %s"
 
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Lỗi nạp tập tin: %s"
 
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Lỗi truy cập tập tin: %s"
 
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 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:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10017,7 +10222,7 @@ msgstr ""
 "Không thể cắt tập tin: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10026,7 +10231,7 @@ msgstr ""
 "Lỗi tự động lưu thông điệp: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10034,7 +10239,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:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -10044,43 +10249,39 @@ msgstr ""
 "\n"
 "Bạn có muốn lưu các thay đổi?"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "Chèn tập tin"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "Tập tin chữ ký:"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr " (mặc định)"
 
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "Biên soạn thông điệp"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10088,7 +10289,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:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10096,9 +10297,9 @@ 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:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -10162,8 +10363,8 @@ msgstr "Chủ đề chứa"
 msgid "Subject does not contain"
 msgstr "Chủ đề không chứa"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10171,12 +10372,11 @@ msgstr ""
 "Tập tin với tên này đã có rồi.\n"
 "Ghi đè tập tin này?"
 
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "Nhớ mật khẩu này"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
@@ -10275,149 +10475,99 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "năm"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "năm"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "giây"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "tháng"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "phút"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "tháng"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "giờ"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "tuần"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "tuần"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "giờ"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "tháng"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "phút"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "tháng"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "giây"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "năm"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "năm"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "Bạn quên chưa chọn ngày"
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "Bạn đã chọn ngày không hợp lệ."
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"Ngày tạo thông điệp sẽ được đối chiếu với bất \n"
-"cứ thời điểm nào, khi mà bộ lọc đang chạy hoặc \n"
-"vfolder được mở."
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
-" điểm bạn xác định ở đây."
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"Ngày của thông điệp sẽ được so sánh với thời \n"
-"điểm tương đối so với lúc bộ lọc chạy; ví \n"
-"dụ \"một tuần trước\"."
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "thời điểm hiện thời"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "thời điểm bạn chọn"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "thời điểm so với hiện thời"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "Chọn thời điểm đối chiếu"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "Đối chiếu"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<nhấn đây để chọn ngày>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "bây giờ"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " trước"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "trước"
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " trước"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<nhấn đây để chọn ngày>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "Chọn thời điểm đối chiếu"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Quy tắc bộ lọc"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Spool `%s' không tồn tại hoặc không phải là một tập tin bình thường"
 
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "Mở tập tin"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "Thì"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "Thêm hành động"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -10425,12 +10575,12 @@ msgstr ""
 "Bạn quên chưa chọn thư mục.\n"
 "Vui lòng quay lại và chọn một thư mục hợp lệ để gửi thư tới."
 
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "Chọn thư mục"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10439,91 +10589,167 @@ msgstr ""
 "Lỗi trong biểu thức chính quy '%s':\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "Quan trọng"
+
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "Đi vào"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "sau khi"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "Kiểm tra"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "Bạn phải đặt tên cho bộ lọc này."
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "Tên quy tắt: "
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "Vô danh"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "Nếu"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "Thực hiện hành động"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "nếu mọi tiêu chuẩn đều thỏa"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "nếu một trong các tiêu chuẩn thỏa"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "Thêm tiêu chuẩn"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "vào"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "ra"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "Đối chiếu"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "Sửa bộ lọc"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "Sửa VFolder"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Vào"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "Ra"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
+" điểm bạn xác định ở đây."
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Ngày của thông điệp sẽ được so sánh với thời \n"
+"điểm tương đối so với lúc bộ lọc chạy; ví \n"
+"dụ \"một tuần trước\"."
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
+" điểm bạn xác định ở đây."
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "Thư mục ảo"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "thời điểm so với hiện thời"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "trước"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "chỉ chọn thư mục"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "thời điểm hiện thời"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "thời điểm bạn chọn"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "Nguồn VFolder"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "với mọi thư mục hoạt động từ xa"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "với mọi thư mục hoạt động từ xa và thư mục cục bộ"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "với mọi thư mục cục bộ"
 
@@ -10551,42 +10777,42 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "Công ty"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "chứa"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Chép vào thư mục"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Ngày nhận"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Ngày gửi"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "không chứa"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "không kết thúc bằng"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "không tồn tại"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "không tồn tại"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "không giống với"
@@ -10608,93 +10834,89 @@ msgid "ends with"
 msgstr "kết thúc bằng"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "Tồn tại"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "tồn tại"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Biểu thức"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "Quan trọng"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "bằng"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "sau"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "trước"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "Đã đặt cờ"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "lớn hơn"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "nhỏ hơn"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "không phải"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "Đã đặt cờ"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Thân thông điệp"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Đầu thông điệp"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Chuyển vào thư mục"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "Gửi thông điệp cho liên lạc"
+
 #: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Phát âm thanh:"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "Đọc"
 
@@ -10710,57 +10932,87 @@ msgstr "Khớp Regex"
 msgid "Replied to"
 msgstr "Trả lời cho"
 
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "lớn hơn"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "nhỏ hơn"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Điểm"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "Người gửi"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Đặt trạng thái"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "Công ty"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Kích thước (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "giống như"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Tài khoản nguồn"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Header xác định"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "bắt đầu bằng"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Chủ đề"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "Đặt trạng thái"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "Quy tắc"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "Sửa quy tắc"
 
@@ -10768,11 +11020,11 @@ msgstr "Sửa quy tắc"
 msgid "Score Rules"
 msgstr "Tính điểm quy tắc"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "Bạn phải đặt tên cho vfolder này."
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 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."
 
@@ -10780,31 +11032,31 @@ msgstr "Bạn cần chọn ít nhất một thư mục làm nguồn."
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "Đang nhập..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "Vui lòng chờ"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Đang nhập %s như là %s"
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
 msgstr "Đang quét %s"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "Thư"
 
@@ -10865,39 +11117,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Rác"
 
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "Tập tin mail cục bộ %s"
 
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "Đang quét thư mục"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "Đang nhập"
 
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Sửa bộ lọc"
 
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -10974,12 +11226,12 @@ msgstr ""
 msgid "Font Preferences"
 msgstr "_Không truy hồi"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "Tài khoản"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -11027,7 +11279,7 @@ msgstr "Thuộc tính..."
 msgid "Change this folder's properties"
 msgstr "Thay đổi thuộc tính thư mục này"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11035,58 +11287,78 @@ msgstr ""
 "Một vài thiết lập về thư của bạn đã bị hỏng, vui lòng kiểm tra để chắc chắn "
 "rằng mọi thứ vẫn hoạt động."
 
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "Bạn chưa thiết lập phương thức vận chuyển thư."
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "Biên soạn thông điệp"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "Thông điệp mới"
+
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "Thông điệp trước"
+
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "Thông điệp thư mới"
+
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Không thể khởi động thành phần thư của Evolution"
 
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Không thể khởi động thành phần cấu hình thư của Evolution"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Không thể khởi động thành phần thông tin thư mục của Evolution."
 
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "Đang kết nối tới server..."
 
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "Không thể đăng ký kho lưu với shell"
 
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Thuộc tính của \"%s\""
 
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "Thuộc tính"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Không thể tạo thư mục tạm: %s"
@@ -11136,135 +11408,135 @@ msgstr "tổng cộng %d"
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ thông điệp"
 
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "_In"
 
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Hoàn tất"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Xóa"
 
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Xóa"
 
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Thêm người gửi vào sổ địa chỉ"
 
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Áp dụng bộ lọc"
 
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc mới từ thông điệp"
 
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "Lọc mailing list"
 
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Lọc mailing list (%s)"
 
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Lọc mailing list (%s)"
@@ -11329,76 +11601,67 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 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-news.c:160
-msgid "Evolution News Editor"
-msgstr "Bộ soạn tin Evolution"
-
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "Bạn có muốn xóa tài khoản này?"
 
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "Không xóa"
 
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "Thật sự muốn xóa tài khoản này chứ?"
 
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
 msgstr "Tắt"
 
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "Bật"
 
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "Bạn có chắc chắn muốn sóa tài khoản news này không?"
-
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "Bật"
 
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "Tên Tài _khoản:"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Portoroz"
@@ -11408,30 +11671,30 @@ msgstr "Portoroz"
 msgid "Mail to %s"
 msgstr "Gửi thư tới %s"
 
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "Chủ để là %s"
 
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "Thừ từ %s"
 
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11439,7 +11702,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11451,7 +11714,7 @@ msgstr ""
 "nhận hoặc biên soạn thư.\n"
 "Bán có muốn cấu hình ngay bây giờ không?"
 
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11459,7 +11722,7 @@ msgstr ""
 "Bạn cần cấu hình thực thể trước khi\n"
 "có thể biên soạn thư."
 
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11468,7 +11731,7 @@ msgstr ""
 "khi có thể biên soạn thư."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11476,11 +11739,11 @@ msgstr ""
 "Bạn đang gửi một lá thư dùng dạng thức HTML, nhưng người nhận không muốn "
 "nhận những lá thư HTML:\n"
 
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "Gửi bất cứ giá nào?"
 
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11488,7 +11751,7 @@ msgstr ""
 "Thông điệp này chưa có chủ đề.\n"
 "Bạn thật sự muốn gửi chứ?"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11496,11 +11759,11 @@ msgstr ""
 "Vì danh sách liên lạc bạn đang gửi được cấu hình để ẩn các địa chỉ trong "
 "danh sách, thông điệp này sẽ chỉ điền người nhận vào trường Bcc."
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "Thông điệp chỉ có người nhận trong Bcc."
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11510,15 +11773,11 @@ msgstr ""
 "Apparently-To.\n"
 "Gửi bất kỳ giá nào?"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "Bạn phải chọn người nhận để có thể gửi thông điệp này."
 
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "Bạn phải cấu hình tài khoản trước khi có thể gửi thư này."
-
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11526,72 +11785,72 @@ msgstr ""
 "Không thể mở thư mục Nháp cho tài khoản này.\n"
 "Bạn có muốn dùng thư mục Nháp mặc định?"
 
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
 
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Chuyển thông điệp tới"
 
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Chép thông điệp vào"
 
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Bạn có chắc muốn sửa tất cả %d thông điệp?"
 
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Bạn chỉ có thể sửa những thông điệp trong thư mục Nháp."
 
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr "Bạn chỉ có thể gửi lại những thông điệp trong thư mục Đã gửi"
 
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "Chưa chọn thông điệp"
 
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Ghi đè tập tin?"
 
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "Hiển thị thông điệp chưa đó kế tiếp"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11603,7 +11862,7 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những thông điệp này không?"
 
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11612,28 +11871,28 @@ msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Đang lấy thông điệp %d trên %d"
 
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "Quá trình in thông điệp thất bại"
 
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr ""
@@ -11655,7 +11914,7 @@ msgstr "Không có mô tả"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "Liên lạc vô danh"
@@ -11676,20 +11935,21 @@ msgid "Add Signature"
 msgstr "Chữ ký dạng _HTML:"
 
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "Vui lòng nhập tên và địa chỉ email vào bên dưới. Trường \"tùy chọn\" bên "
 "dưới không cần phải được chọn, trừ khi bạn muốn gộp thông tin vào email bạn "
 "cần gửi."
 
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "Vui lòng nhập thông tin về incoming mail server bên dưới. Nếu bạn không "
 "chắc, hãy hỏi quản trị hệ thống hoặc ISP của bạn."
@@ -11699,23 +11959,22 @@ msgid "Please select among the following options"
 msgstr "Vui lòng chọn từ các tuỳ chọn sau"
 
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 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:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "Bạn đà hoàn thành gần xong tiến trình cấu hình thư. Thực thể, incoming mail "
 "server và outgoint mail transport mà bạn cung cấp sẽ được nhóm lại với nhau "
@@ -11724,44 +11983,20 @@ msgstr ""
 "Tên này sẽ chỉ được dùng để hiển thị thôi."
 
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "Đi vào"
-
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "sau khi"
-
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "Tài khoản %d"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ"
 
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
@@ -12023,241 +12258,229 @@ msgstr "Lưu và đóng"
 msgid "Loading Images"
 msgstr "Nạp ả_nh"
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "Thông điệp"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "_Hiển thị thông điệp"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "Sương mù"
 
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP Server:"
-
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "New River"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP:"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 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:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "In liên lạc được chọn"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "Không thể mở thông điệp"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "Quoted"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Trả lời cho:"
 
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "Đang nhận tùy chọn"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "Thông tin yêu cầu"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "Mặc định"
+
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "Bảo mật"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME bảo mật"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "Chọn chương trình PGP"
 
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu chứng thực"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "Cấu hình server"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Lối tắt"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "Tập tin chữ ký:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "Tập tin chữ ký:"
 
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "Nguồn"
-
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "Thông tin nguồn"
-
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Tên kiểu:"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 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:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Biến đổi"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12267,203 +12490,199 @@ msgstr ""
 "\n"
 "Nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "Đông"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Chữ ký dạng _HTML:"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 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:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "_Loại chứng thực: "
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "_Loại chứng thực: "
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 msgid "_Automatically insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Xoá mọi thứ trừ chữ ký"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "Mặc định"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "Bật"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Chuyển tiếp như là"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "_Tên đầy đủ:"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "Trong thư HTML"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "Thực thể"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu đã đọ_c sau "
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "Đường dẫn chương trình _PGP:"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "Đang nhận thư"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Trả lời tất cả"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "Đang gửi thư"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Hiện thời gian là"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "Tập tin _chữ ký:"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL)"
 
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Biến đổi"
 
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "_mỗi"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " màu"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12487,197 +12706,207 @@ msgstr ""
 msgid "Could not create a S/MIME decode context."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "Lưu đồ đính kèm"
 
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Không thể tạo thư mục tạm: %s"
 
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "Lưu vào đĩa..."
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Lưu đồ đính kèm"
 
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "Ẩn"
 
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "Trình xem ngoại"
 
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "Nạp ả_nh"
+
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "Đang nạp nôi dung thông điệp"
 
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "Công việc quá hạn:"
 
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%d %b %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "Chép liên kết là (CẦN SỬA)"
 
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "Lưu ảnh là..."
 
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s đồ đính kèm"
 
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 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/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "Địa chỉ sai"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "Từ"
 
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Tới"
 
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "Thư"
 
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "Lưu thông điệp là..."
-
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Không thể tạo dịch vụ báo động"
 
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
 
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới tập tin từ xa (%s)"
 
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Thư mục cục bộ"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "Cấu hình lại thư mục"
 
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Đang đổi thư mục \"%s\" sang dạng thức \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "%s không thể được cấu hình lại vì không phải là thư mục cục bộ"
 
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12685,16 +12914,16 @@ msgstr ""
 "Nếu bạn không còn có thể mở hộp thư này nữa thì bạn cần phải sửa chữa thủ "
 "công."
 
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "Bạn không thể thay đổi dạng thức của thư-mục-không-cục-bộ."
 
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Cấu hình lại /%s"
 
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -12703,7 +12932,7 @@ msgstr ""
 "Lỗi khi '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -12712,7 +12941,7 @@ msgstr ""
 "Lỗi khi đang thực hiện thao tác:\n"
 "%s"
 
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Đang làm việc"
 
@@ -12720,100 +12949,100 @@ msgstr "Đang làm việc"
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục"
 
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "Tuy nhiên, thông điệp đã được gửi đi."
 
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Đang gửi \"%s\""
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Lỗi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -12822,7 +13051,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12831,11 +13060,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12844,27 +13073,22 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "_Tìm"
 
@@ -12919,32 +13143,41 @@ msgstr "Đường dẫn: %s, Kiểu: %s"
 msgid "Type: %s"
 msgstr "Kiểu: %s"
 
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "Gửi và nhận thư"
 
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "Hủy tất cả"
 
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "Đang cập nhập..."
 
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:321
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "_Nhớ mật khẩu này"
+
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
+
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
@@ -12971,7 +13204,7 @@ msgstr ""
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Tên:"
 
@@ -13001,7 +13234,7 @@ msgstr "Thông điệp chuyển tiếp - %s"
 msgid "Forwarded message"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "Thông điệp chuyển tiếp"
 
@@ -13015,7 +13248,7 @@ msgstr "Thiết lập vfolder: %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13024,94 +13257,97 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(Không chủ đề)"
 
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Thông điệp"
 
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1105
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -13146,47 +13382,47 @@ msgstr "Đã nhận"
 msgid "Size"
 msgstr "Kích thước"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "McCall"
 
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Chuyển tiếp"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "Thông tin nguồn"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Trả lời"
 
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Trả lời tất cả"
 
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "Xem thử"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13210,16 +13446,16 @@ msgstr "Đang đăng ký trên thư mục \"%s\""
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Đang bỏ đăng ký trên thư mục \"%s\""
 
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Thư mục"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
@@ -17681,11 +17917,11 @@ msgid "Kushiro Airport"
 msgstr "Sân bay Kushiro"
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -23105,8 +23341,8 @@ msgstr "Không có mô tả"
 msgid "Mail summary"
 msgstr "Tóm tắt thư"
 
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
@@ -23124,15 +23360,15 @@ msgstr "KBOS"
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "Trích dẫn trong ngày"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
@@ -23144,27 +23380,27 @@ msgstr "Lỗi khi tải xuống RDF"
 msgid "News Feed"
 msgstr ""
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "McAllen"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "T_hêm"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "Shelton"
 
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "Không có công việc"
 
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(Không có mô tả)"
 
@@ -24436,7 +24672,8 @@ msgid "Tasks "
 msgstr "Công việc"
 
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "Thiết lập thời tiết"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -24492,7 +24729,7 @@ msgstr "Xem chi tiết"
 msgid "Cancel Operation"
 msgstr "Hủy tác vụ"
 
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24506,20 +24743,20 @@ msgstr ""
 msgid "Add a Folder"
 msgstr "Thư mục"
 
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "Nháp"
 
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Thư mục nhận"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "Thư mục gửi"
 
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "Đã gửi"
 
@@ -24750,20 +24987,15 @@ msgstr ""
 "%s"
 
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - Tạo thư mục mới"
-
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Tạo thư mục mớ_i..."
 
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "Mới..."
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(Không tựa)"
 
@@ -24785,7 +25017,7 @@ msgstr ""
 "Bạn có thể chọn \"Tự động\" nếu bạn không biết, và Evolution sẽ thử tự tìm "
 "cách hoạt động."
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "Vui lòng chọn thông tin bạn muốn nhập:"
 
@@ -24816,21 +25048,17 @@ msgstr ""
 msgid "Select importer"
 msgstr "Chọn thư mục"
 
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
 
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Lỗi Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "Bạn chỉ có thể nhập vào thư mục cục bộ"
-
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -24839,11 +25067,11 @@ msgstr ""
 "Không có bộ nhập nào có thể xử lý\n"
 "%s"
 
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "Đang nhập"
 
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -24852,17 +25080,17 @@ msgstr ""
 "Đang nhập %s.\n"
 "Đang khởi động %s"
 
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "Lỗi khởi động %s"
 
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "Lỗi nạp %s"
 
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -24871,31 +25099,31 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
 
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "Nhập tập tin đơn"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -24903,24 +25131,24 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "Nhập"
 
@@ -24968,9 +25196,14 @@ msgstr "Đang mở thư mục %s"
 msgid "in \"%s\" ..."
 msgstr "Mở bằng %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "Không thể đổi tên thư mục: %s"
+
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "Không thể tạo thư mục đã cho:\n"
 "%s"
@@ -24986,8 +25219,8 @@ msgstr ""
 msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "Mới"
@@ -25028,57 +25261,58 @@ msgstr "Đi tới thư mục..."
 msgid "Select the folder that you want to open"
 msgstr "Chọn thư mục bạn muốn mở"
 
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "Tạo lối tắt mới"
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Chọn thư mục bạn muốn lối tắt chỉ đến:"
 
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(Chưa hiển thị thư mục)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(Không)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang "
 "ngoại tuyến."
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Volution đang trong tiến trình chuyển sang ngoại tuyến."
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25090,12 +25324,12 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt:\n"
 "%s"
 
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25103,138 +25337,148 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "Tạo nhóm lối tắt mới"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "Tên nhóm:"
 
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr "Bạn có thực sự muốn bỏ nhóm `%s' từ thanh Lối tắt?"
 
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "Không loại bỏ"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "Đổi tên nhóm lối tắt"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 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:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "_Biểu tượng nhỏ"
 
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 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:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "Biểu tượng _lớn"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 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:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "_Nhóm mới..."
 
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "Tạo nhóm lối tắt mới"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "Loại bỏ nhóm này..."
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "Loại bỏ nhóm lối tắt này"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "Đổi tên nhóm này..."
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "Đổi tên nhóm lối tắt này"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "Ẩn thanh _lối tắt"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "Ẩn Thanh lối tắt"
 
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "Tạo lối tắt mới"
+
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "Tạo lối tắt mới"
+
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "Đổi tên lối tắt"
 
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "Đổi tên lối tắt đã chọn thành:"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 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:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 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:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "Đổi tên lối tắt"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "Đổi tên"
 
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 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:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "Lỗi lưu lối tắt"
 
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "Lối tắt"
 
@@ -25243,55 +25487,55 @@ msgstr "Lối tắt"
 msgid "Checkbox"
 msgstr "Chico"
 
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "Không có lỗi"
 
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "Thư mục cùng tên đã tồn tại"
 
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "Kiểu thư mục không hợp lệ"
 
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "Lỗi I/O"
 
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "Không đủ chỗ để tạp thư mục"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "Thư mục không rỗng"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "Không tìm thấy thư mục"
 
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "Chức năng này chưa được thực hiện trong kho lưu trữ này"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "Chưa hỗ trợ tác vụ"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "Kho chứa này chưa hộ trợ kiểu đã cho"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "Thư mục đã cho không thể bị thay đổi hoặc loại bỏ"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Không thể tạo một thư mục con của một trong những descendant của nó"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "Không thể tạo thư mục với tên đó"
 
@@ -25346,63 +25590,63 @@ msgstr ""
 "Lỗi từ hệ thống kích hoạt:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "Lỗi CORBA"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "Đã ngắt"
 
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "Đối số không hợp lệ"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "Đã có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "Không có chủ sở hữu"
 
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "Không tìm thấy"
 
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "Kiểu chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "Lược đồ không hỗ trợ"
 
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "Thao tác chưa hỗ trợ"
 
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "Lỗi nội tại"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "Tồn tại"
 
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "URI sai"
 
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "Có thư mục con"
 
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "Không còn chỗ"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "Chủ sở hữu cũ đã chết"
 
@@ -25427,6 +25671,26 @@ msgstr "Máy chủ"
 msgid "The following connections are currently active:"
 msgstr "Những kết nối sau đang hoạt động:"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Lịch"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Liên lạc: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Thư"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Công việc"
+
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
 msgstr "Tên thư mục:"
@@ -25439,6 +25703,34 @@ msgstr "Kiểu thư mục:"
 msgid "Specify where to create the folder:"
 msgstr "Xác định nơi tạo thư mục:"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Tạo thư mục mớ_i..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Tên thư mục:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "Tên Ser_ver:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "_Tên người dùng:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Evolution Setup Assistant"
 msgstr "Trợ tá thiết lập Evolution"
@@ -25534,15 +25826,15 @@ msgstr "Đừng hỏi tôi lần nữa"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
 
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution đang thoát..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25562,53 +25854,53 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Đừng hỏi tôi lần nữa"
 
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
 
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
 
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Đang nhập"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin debug của mọi thành phần vào tập tin."
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Không thể khởi động hệ thống thành phần Bonobo."
 
@@ -25645,116 +25937,110 @@ msgstr "Sao chép vùng chọn"
 msgid "Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "Tạo liên lạc mới"
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "Tạo danh sách liên lạc mới"
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Cắt vùng chọn"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "Xoá liên lạc được chọn"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "Chuyển thông điệp được chọn tới thư mục khác"
 
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "Dán vào clipboard"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "Xem trước liên lạc cần in"
 
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "Xem thử bản in"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "In liên lạc được chọn"
 
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "Lưu liên lạc được chọn vào VCard."
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Chọn tất cả"
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "Chọn mọi liên lạc"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "Gửi một thông điệp tới liên lạc được chọn."
 
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "Gửi liên lạc được chọn cho người khác"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "Dừng"
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "Ngưng nạp"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "thời điểm hiện thời"
 
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Hành động"
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "_Danh sách liên lạc"
-
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Chuyển tiếp liên lạc..."
 
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "Lư_u là VCard"
 
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "_Tìm liên lạc"
 
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "Chọn _tất cả"
 
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "_Gửi thông điệp tới liên lạc..."
@@ -25799,11 +26085,6 @@ msgstr "Tháng"
 msgid "Previews the calendar to be printed"
 msgstr "Xem trước lịch cần in"
 
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "Xem thử bản in"
-
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
 msgstr "In lịch"
@@ -25836,7 +26117,7 @@ msgstr "Tuần"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Đóng"
 
@@ -25849,7 +26130,7 @@ msgid "Delete this item"
 msgstr "Xóa mục này"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "Thanh công cụ chính"
 
@@ -25861,8 +26142,8 @@ msgstr "Xem trước mục cần in"
 msgid "Print this item"
 msgstr "In mục này"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "Lưu"
 
@@ -25887,9 +26168,9 @@ msgstr "Lưu mục này vào đĩa"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -25899,7 +26180,7 @@ msgstr "In _bao thư..."
 
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Lư_u là..."
 
@@ -25913,8 +26194,8 @@ msgstr "_Gửi thông điệp tới liên lạc..."
 
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Lưu"
 
@@ -26011,26 +26292,36 @@ msgid "Permanently remove all deleted messages from all folders"
 msgstr "Loại bỏ vĩnh viễn những thông điệp đã xóa của mọi thư mục"
 
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "Thông điệp mới"
+
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "Đang lưu thông điệp vào thư mục"
+
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "Hiện khung xem trước"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Đăng ký hoặc hủy đăng ký thư mục trên server từ xa"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "Bộ hiệu chỉnh thư mục ảo..."
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "_Bộ lọc..."
 
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "Khung xem thử"
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "Đă_ng ký thư mục..."
 
@@ -26128,7 +26419,7 @@ msgstr "Danh sách thông điệp theo nhánh"
 msgid "_Expunge"
 msgstr "_Bỏ"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_thư mục"
 
@@ -26389,182 +26680,197 @@ msgstr "Thông điệp chưa đọc trước"
 
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "Trả lời công việc"
+
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
+
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Thông điệp quan trọng trước"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Xem trước thông điệp cần in"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Trước đó"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "In thông điệp"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "Woensdrecht"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Chuyển tiếp thông điệp được chọn tới người khác"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Phục hồi kích thước text gốc"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "Tì_m thông điệp..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "_Nhỏ hơn"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Lưu thông điệp như là text"
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Tìm text trong thân thông điệp hiển thị"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "Cài đặt thiết lập trang cho máy in hiện thời"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Hiện toàn bộ _header"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Hiện thông điệp theo cách bình thường"
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Hiện thông điệp với phần header"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Hiện thông điệp thô (chưa xử lý)"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "_Cỡ text"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "VFolder trên Người _gửi..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "VFolder trên _Người nhận..."
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "VFolder trên _Chủ đề..."
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "Đính kèm"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Sao chép vào thư mục"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Tạo bộ lọc từ thông điệp"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "Chuyển _tiếp thông điệp"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Đi vào"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "_Trực tuyến"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Lớn hơn"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Hiển thị thông điệp"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Chuyển vào thư mục"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Thông điệp kế"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "Hiển thị _bình thường"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Mở thông điệp"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Thông điệp trước"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "Quoted"
 
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "Đổi _tên..."
+
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "_Công cụ"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "Đóng cửa sổ này"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "Đón_g"
 
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "_Xem"
 
@@ -26592,169 +26898,161 @@ msgstr "Mã hoá thông điệp này, dùng Chứng nhận Mã hóa S/MIME"
 msgid "For_mat"
 msgstr "_Dạng thức"
 
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "H_TML"
 
 #: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "Chèn tập tin text vào thông điệp"
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "Chèn tập tin text..."
-
-#: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Mở"
 
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Mở tập tin"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Mã hóa PGP"
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Chữ ký PGP"
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "Mã hoá S/MIME"
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "Chữ ký S/MIME"
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lưu là"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "Lưu _nháp"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Lưu vào thư mục..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Lưu tập tin hiện thời"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Lưu tập tin hiện thời với tên khác"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Lưu thông điệp vào thư mục xác định"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Gửi"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "Gửi _sau"
-
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "Gửi _sau"
-
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Gửi thông điệp với dạng thức HTML"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "Sẽ gửi thông điệp sau"
-
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "Gửi thông điệp ngay"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "Hiện / Ẩn đồ đính kèm"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "Hiện đồ đính _kèm"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "Hiện đồ đính kèm"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "Ký tên vào thông điệp này, dùng khoá PGP"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Ký tên vào thông điệp này, dùng Chứng nhận Chữ ký S/MIME"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bật tắt hiển thị trường BCC"
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bật tắt hiển thị trường CC"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Bật tắt hiển thị trường From (Từ)"
 
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bật tắt hiển thị trường Reply-To (trả lời)"
 
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "Đồ đính _kèm..."
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "Trường _BCC"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "Trường _CC"
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "_Xoá tất cả"
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "Trường _From (Từ)"
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Chèn"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Mở..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "Trường _Reply-To (Trả lời)"
 
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "H_TML"
+
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Lưu mục này và đóng hộp thoại"
+
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "Trợ _giúp"
 
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "Tập tin chữ ký:"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Thêm thư mục vào danh sách những thư mục đăng ký"
@@ -26852,171 +27150,202 @@ msgid "Add to _Shortcut Bar"
 msgstr "Thêm và Thanh _Lối tắt"
 
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "Thay đổi tên thư mục này"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "Sao chép thư mục này"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "Tạo thư mục mớ_i..."
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "Tạo liên kết đến thư mục này trong Thanh Lối tắt"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "Tạo thư mục mới"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "Tạo lối tắt mới"
+
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Tạo thư mục mới"
+
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "Xoá thư mục này"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "Hiển thị thư mục khác"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "T_hoát"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "_Cửa sổ Evolution"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "Thoát chương trình"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "Nhập dữ liệu từ chương trình khác"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "Di chuyển thư mục này tới nơi khác"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "Tạo thư mục mớ_i..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "Mở thư mục này trong cửa sổ khác"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Thiết lập thư..."
+
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các thư đang đợi gửi và nhận thư mới"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Cấu hình thư"
+
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "Bật tắt"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Bật tắt hiện thanh lối tắt"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "Xem thư mục được chọn"
 
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "_Giới thiệu Ximian Evolution..."
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "_Sao chép..."
 
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "Thanh Thư _mục"
 
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "_thư mục"
+
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Đ_i tới thư mục..."
 
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "_Di chuyển..."
 
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "Thư mục mớ_i"
 
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr ""
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "_Không truy hồi"
 
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "Đổi _tên..."
 
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "_Lối tắt"
-
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "Thanh _lối tắt"
 
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "_Lối tắt"
+
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
 msgstr "In tóm tắt"
@@ -27030,17 +27359,40 @@ msgid "Reload the view"
 msgstr "Nạp lại khung xem"
 
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "Card địa chỉ"
+#, fuzzy
+msgid "By _Company"
+msgstr "Theo Công ty"
 
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "Theo Công ty"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "Card địa chỉ"
 
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "Danh sách điện thoại"
 
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Khung tuần"
+
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Khung ngày"
+
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "Khung tháng"
+
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Khung tuần làm việc"
+
 #: views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As Sent Folder"
@@ -27066,13 +27418,19 @@ msgstr "Theo chủ đề"
 msgid "Messages"
 msgstr "Thông điệp"
 
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "Với phân loại"
 
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "Nhiệm _vụ"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr "UTC"
 
@@ -27223,11 +27581,11 @@ msgstr "Bộ mã"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "Bộ biên soạn tìm kiếm"
 
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "Lưu tìm kiếm"
 
@@ -27267,21 +27625,21 @@ msgstr "Thông báo"
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "Tìm ngay"
 
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "Xóa"
 
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "Tìm ngay"
 
@@ -27295,18 +27653,138 @@ msgstr "Server Sổ địa chỉ cá nhân"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr ""
 
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): không thể khởi động Gnome-VFS"
 
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): không thể khởi động GNOME"
 
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): không thể khởi động Bonobo"
 
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution không thể lấy sổ địa chỉ cục bộ.\n"
+#~ "Có lẽ do thành phần evolution-addressbook bị hỏng.\n"
+#~ "Để giúp chúng tôi hiểu và giải quyết tốt hơn vấn đề này,\n"
+#~ "vui lòng gửi email cho Jon Trowbridge <trow@ximian.com> với \n"
+#~ "mô tả chi tiết về trường hợp xảy ra lỗi. Cám ơn bạn."
+
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution không thể lấy sổ địa chỉ cục bộ.\n"
+#~ "Trong điều kiện bình thường, điều này không xảy ra.\n"
+#~ "Có lẽ bạn cần thoát và khởi động lại Evolution để \n"
+#~ "khắc phục sự cố."
+
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "_Di chuyển..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "Trạng thái cuộc họp đã thay đổi. Gửi phiên bản cập nhật?"
+
+#~ msgid "_Delete this Appointment"
+#~ msgstr "_Xoá cuộc hẹn"
+
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "Lỗi I/O"
+
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Lỗi trả lời chào mừng: %s: có lẽ không phải lỗi chết người"
+
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "Yêu cầu HELO quá hạn: %s: không nghiêm trọng"
+
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "Lỗi trả lời HELO: %s: không nghiêm trọng"
+
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "Quá hạn yêu cầu QUIT: %s: không nghiêm trọng"
+
+#~ msgid "Insert File"
+#~ msgstr "Chèn tập tin"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "Bạn đã chọn ngày không hợp lệ."
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "Ngày tạo thông điệp sẽ được đối chiếu với bất \n"
+#~ "cứ thời điểm nào, khi mà bộ lọc đang chạy hoặc \n"
+#~ "vfolder được mở."
+
+#~ msgid "Evolution News Editor"
+#~ msgstr "Bộ soạn tin Evolution"
+
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "Bạn có chắc chắn muốn sóa tài khoản news này không?"
+
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "Bạn phải cấu hình tài khoản trước khi có thể gửi thư này."
+
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP Server:"
+
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "New River"
+
+#~ msgid "Source"
+#~ msgstr "Nguồn"
+
+#~ msgid "Source Information"
+#~ msgstr "Thông tin nguồn"
+
+#~ msgid "Save to Disk..."
+#~ msgstr "Lưu vào đĩa..."
+
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "Lưu thông điệp là..."
+
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - Tạo thư mục mới"
+
+#~ msgid "You may only import to local folders"
+#~ msgstr "Bạn chỉ có thể nhập vào thư mục cục bộ"
+
+#~ msgid "_Contact List"
+#~ msgstr "_Danh sách liên lạc"
+
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "Chèn tập tin text vào thông điệp"
+
+#~ msgid "Insert text file..."
+#~ msgstr "Chèn tập tin text..."
+
+#~ msgid "Send _Later"
+#~ msgstr "Gửi _sau"
+
+#~ msgid "Send _later"
+#~ msgstr "Gửi _sau"
+
+#~ msgid "Send the message later"
+#~ msgstr "Sẽ gửi thông điệp sau"
+
 #~ msgid "Card: "
 #~ msgstr "Card: "
 
@@ -27605,12 +28083,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "British Virgin Islands"
 #~ msgstr "Đảo British Virgin"
 
-#~ msgid "Create a new appointment"
-#~ msgstr "Tạo cuộc hẹn mới"
-
-#~ msgid "Create a new task"
-#~ msgstr "Tạo công việc mới"
-
 #~ msgid "New _Task"
 #~ msgstr "Nhiệm _vụ mới"
 
@@ -27775,9 +28247,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgstr ""
 #~ "Việc này sẽ kết nối tới POP server và dùng Kerberos 4 để chứng thực."
 
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "Không thể chứng thực KPOP server: %s"
-
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "Không thể kết nối tới server: %s"
 
@@ -27820,9 +28289,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "Thư mục lưu trữ thư (nội tại)"
 
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "Không thể kết nối tới kho: %s"
-
 #~ msgid "New _Mail Message"
 #~ msgstr "Thông điệp thư _mới"
 
@@ -27871,9 +28337,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "_Tổ chức:"
 
-#~ msgid "_Remember this password"
-#~ msgstr "_Nhớ mật khẩu này"
-
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "_Gửi thư mặc định dùng dạng HTML"
 
@@ -27949,9 +28412,6 @@ msgstr "init_bonobo(): không thể khởi động Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "Tạo hoặc sửa tài khoản mail và các thông số khác"
 
-#~ msgid "New Message"
-#~ msgstr "Thông điệp mới"
-
 #~ msgid "Forward _Attached"
 #~ msgstr "Chuyển tiếp đính _kèm"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4ed4818e18..9a5e28ff63 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2002-02-04 22:51+0800\n"
 "Last-Translator: Wang Li <charlesw1234@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -54,7 +54,7 @@ msgstr ""
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
 # addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "名称"
@@ -750,15 +750,15 @@ msgstr "无法初始化 Bonobo"
 # addressbook/backend/pas/pas-backend-ldap.c:2269
 # addressbook/backend/pas/pas-backend-file.c:259
 # addressbook/backend/pas/pas-backend-ldap.c:2272
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 msgid "Searching..."
 msgstr "搜索..."
 
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
 # addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 msgid "Loading..."
 msgstr "装入..."
 
@@ -766,42 +766,42 @@ msgstr "装入..."
 # addressbook/backend/pas/pas-backend-file.c:270
 # addressbook/backend/pas/pas-backend-file.c:270
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 msgid "Error in search expression."
 msgstr "搜索表达式错误。"
 
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:912
 # addressbook/backend/pas/pas-backend-ldap.c:915
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 msgid "Adding card to LDAP server..."
 msgstr "正在将卡片添加到 LDAP 服务器..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1013
 # addressbook/backend/pas/pas-backend-ldap.c:1016
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 msgid "Removing card from LDAP server..."
 msgstr "正在从 LDAP 服务器删除卡片..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1123
 # addressbook/backend/pas/pas-backend-ldap.c:1126
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr "正在修改 LDAP 服务器上的卡片..."
 
 # addressbook/backend/pas/pas-backend-ldap.c:2219
 # addressbook/backend/pas/pas-backend-ldap.c:2219
 # addressbook/backend/pas/pas-backend-ldap.c:2222
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr "开始搜索，"
 
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2214
 # addressbook/backend/pas/pas-backend-ldap.c:2217
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr "正在接收 LDAP 的搜索结果..."
 
@@ -811,7 +811,7 @@ msgstr "正在接收 LDAP 的搜索结果..."
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "删除卡片错误"
@@ -819,7 +819,7 @@ msgstr "删除卡片错误"
 # camel/camel-url.c:288
 # camel/camel-url.c:288
 # camel/camel-url.c:288
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "无法解析 URL “%s”"
@@ -987,11 +987,11 @@ msgstr ""
 # calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
 # shell/e-shortcuts.c:1061
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "联系人"
 
@@ -1016,39 +1016,54 @@ msgstr "LDAP 服务器"
 msgid "LDAP server containing contact information"
 msgstr "含有联系人信息的 LDAP 服务器"
 
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:527
-# addressbook/gui/component/addressbook-component.c:530
-#: addressbook/gui/component/addressbook-component.c:578
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:33
-#: addressbook/gui/component/addressbook-component.c:578
-#, fuzzy
-msgid "Contact _List"
-msgstr "联系人列表(_C)"
-
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:526
 # ui/evolution-addressbook.xml.h:11
 # addressbook/gui/component/addressbook-component.c:527
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/gui/component/addressbook-component.c:581
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "新建联系人"
 
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:31
 # ui/evolution-addressbook.xml.h:32
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "联系人(_C)"
 
+# ui/evolution-addressbook.xml.h:4
+# ui/evolution-addressbook.xml.h:4
+# ui/evolution-addressbook.xml.h:4
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "创建新的联系人"
+
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:527
+# addressbook/gui/component/addressbook-component.c:530
+#: addressbook/gui/component/addressbook-component.c:568
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#: addressbook/gui/component/addressbook-component.c:568
+#, fuzzy
+msgid "Contact _List"
+msgstr "联系人列表(_C)"
+
+# ui/evolution-addressbook.xml.h:5
+# ui/evolution-addressbook.xml.h:5
+# ui/evolution-addressbook.xml.h:5
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "创建新的联系人列表"
+
 # addressbook/backend/pas/pas-backend-ldap.c:493
 # addressbook/backend/pas/pas-backend-ldap.c:493
 # addressbook/backend/pas/pas-backend-ldap.c:496
@@ -1076,14 +1091,14 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
@@ -1093,7 +1108,7 @@ msgstr ""
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:608
 # camel/providers/imap/camel-imap-command.c:610
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP 服务器应答不含有 %s 信息"
@@ -1101,7 +1116,7 @@ msgstr "IMAP 服务器应答不含有 %s 信息"
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
 # mail/mail-config.glade.h:3
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(在该版本的 evolution 中不支持SSL)"
@@ -1113,7 +1128,7 @@ msgstr "(在该版本的 evolution 中不支持SSL)"
 # addressbook/gui/component/addressbook-factory.c:70
 # calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "无法创始化 gnome-vfs"
 
@@ -1127,14 +1142,14 @@ msgstr "其他联系人"
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:485
 # addressbook/gui/component/addressbook.c:499
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "无法打开地址簿"
 
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:494
 # addressbook/gui/component/addressbook.c:508
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -1147,7 +1162,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:499
 # addressbook/gui/component/addressbook.c:513
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -1162,7 +1177,7 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:507
 # addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -1174,13 +1189,13 @@ msgstr ""
 # addressbook/gui/component/addressbook.c:640
 # addressbook/gui/component/addressbook.c:655
 # addressbook/gui/component/addressbook.c:658
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "为 %s (用户 %s)输入口令"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "以之结束"
@@ -1197,7 +1212,7 @@ msgstr "以之结束"
 # addressbook/gui/component/e-address-popup.c:484
 # addressbook/gui/contact-editor/e-contact-editor.c:1687
 # addressbook/gui/widgets/e-addressbook-view.c:986
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "电子邮件 2"
@@ -1208,7 +1223,7 @@ msgstr "电子邮件 2"
 # calendar/gui/cal-search-bar.c:59
 # addressbook/gui/component/addressbook.c:839
 # calendar/gui/cal-search-bar.c:59
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "类别为"
@@ -1220,7 +1235,7 @@ msgstr "类别为"
 # addressbook/gui/component/addressbook.c:836
 # calendar/gui/cal-search-bar.c:55
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何域含有"
@@ -1230,7 +1245,7 @@ msgstr "任何域含有"
 # widgets/misc/e-filter-bar.h:104
 # addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "高级..."
 
@@ -1241,7 +1256,7 @@ msgstr "高级..."
 # addressbook/gui/component/addressbook.c:1067
 # calendar/gui/cal-search-bar.c:412
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "任何类别"
@@ -1249,7 +1264,7 @@ msgstr "任何类别"
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1107
 # addressbook/gui/component/addressbook.c:1150
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "文件夹浏览器将显示的 URI"
 
@@ -1446,7 +1461,7 @@ msgstr "地址簿资源"
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # addressbook/gui/contact-editor/fulladdr.glade.h:3
 # my-evolution/Locations.h:43
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -1581,8 +1596,8 @@ msgstr "边界"
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "每(_E)"
@@ -1654,8 +1669,8 @@ msgstr "搜索范围(_C)："
 # calendar/gui/e-week-view.c:1188
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 msgid "Searching"
 msgstr "搜索"
 
@@ -1872,7 +1887,7 @@ msgid "Using email address"
 msgstr "电子邮件地址"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1894,8 +1909,8 @@ msgstr ""
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -1987,12 +2002,12 @@ msgstr "下载上限(_D)"
 # ui/evolution-message-composer.xml.h:47
 # ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
 # ui/evolution-tasks.xml.h:19
-#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "编辑(_E)"
@@ -2168,10 +2183,10 @@ msgstr "地址簿名称选择界面车间"
 # composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:436
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "删除"
 
@@ -2218,55 +2233,21 @@ msgstr "(%d 未显示)"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
+# addressbook/gui/component/select-names/e-select-names.c:608
+# addressbook/gui/component/select-names/e-select-names.c:608
+# addressbook/gui/component/select-names/e-select-names.c:671
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "从地址簿中选择联系人"
+
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
 # default_user/searches.xml.h:6
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "发件人含有"
 
-# addressbook/gui/component/select-names/e-select-names.c:524
-# addressbook/gui/component/select-names/e-select-names.c:524
-# addressbook/gui/component/select-names/e-select-names.c:581
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-"Evolution 无法获取本地地址簿空间。\n"
-"这可能是由 evolution 的地址簿组件崩溃导致的。\n"
-"为了帮助我们更好地理解并最终解决该问题，\n"
-"请把对产生该错误环境的详细情况作为电子邮件发送给\n"
-" Jon Trowbridge <trow@ximian.com>。\n"
-"谢谢。"
-
-# addressbook/gui/component/select-names/e-select-names.c:532
-# addressbook/gui/component/select-names/e-select-names.c:532
-# addressbook/gui/component/select-names/e-select-names.c:589
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-"Evolution 无法获得地址簿本地存储。\n"
-"在普通环境下，这不会发生。\n"
-"您可能需要退出并重新启动 Evolution 以便\n"
-"改正这一问题。"
-
-# addressbook/gui/component/select-names/e-select-names.c:608
-# addressbook/gui/component/select-names/e-select-names.c:608
-# addressbook/gui/component/select-names/e-select-names.c:671
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "从地址簿中选择联系人"
-
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:4
 # addressbook/gui/component/select-names/select-names.glade.h:3
@@ -2305,25 +2286,17 @@ msgid ""
 "select one from the list below:"
 msgstr ""
 
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-# ui/evolution.xml.h:42
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "移动(_M)..."
-
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:6
 # addressbook/gui/component/select-names/select-names.glade.h:5
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "类别(_C)："
 
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:7
 # addressbook/gui/component/select-names/select-names.glade.h:6
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "文件夹(_F)："
 
@@ -2522,11 +2495,12 @@ msgstr "愿意接收 HTML 邮件(_H)"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -4703,7 +4677,7 @@ msgstr "在往该列表发送邮件时隐藏地址(_H)"
 # addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "删除(_R)"
 
@@ -4811,7 +4785,7 @@ msgstr ""
 # addressbook/gui/search/e-addressbook-search-dialog.c:145
 # widgets/misc/e-filter-bar.c:238
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "高级搜索"
 
@@ -4866,7 +4840,7 @@ msgstr "启动 %s 错误"
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-minicard.c:475
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "修改卡片错误"
@@ -4878,7 +4852,7 @@ msgstr "修改卡片错误"
 # addressbook/gui/widgets/e-addressbook-util.c:33
 # shell/evolution-shell-component.c:1020
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "成功"
 
@@ -4897,8 +4871,8 @@ msgstr "成功"
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "未知的错误"
 
@@ -4915,8 +4889,8 @@ msgstr "仓库离线"
 # shell/evolution-shell-component.c:1035
 # addressbook/gui/widgets/e-addressbook-util.c:36 shell/e-storage.c:516
 # shell/evolution-shell-component.c:1048
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "没有权限"
 
@@ -4957,7 +4931,7 @@ msgstr "不支持的协议"
 # calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
 # camel/camel-service.c:610 camel/camel-service.c:646
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -4985,10 +4959,18 @@ msgstr "必须认证"
 msgid "TLS not Available"
 msgstr ""
 
+# shell/e-shell-importer.c:397
+# shell/e-shell-importer.c:397
+# shell/e-shell-importer.c:409
+#: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "文件 %s 不存在"
+
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
 # addressbook/gui/widgets/e-addressbook-util.c:41
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "其它错误"
 
@@ -4998,7 +4980,7 @@ msgstr "其它错误"
 # calendar/gui/dialogs/save-comp.c:50
 # addressbook/gui/widgets/e-addressbook-util.c:57
 # calendar/gui/dialogs/save-comp.c:50
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "您希望保存修改吗？"
@@ -5006,29 +4988,29 @@ msgstr "您希望保存修改吗？"
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "添加列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
 # addressbook/gui/widgets/e-addressbook-util.c:76
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "添加卡片错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
 # addressbook/gui/widgets/e-addressbook-util.c:85
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "修改列表错误"
 
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-util.c:95
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "删除列表错误"
 
@@ -5038,8 +5020,8 @@ msgstr "删除列表错误"
 # addressbook/gui/widgets/e-addressbook-view.c:1278
 # addressbook/gui/widgets/e-addressbook-util.c:95
 # addressbook/gui/widgets/e-addressbook-view.c:1389
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "删除卡片错误"
@@ -5047,19 +5029,19 @@ msgstr "删除卡片错误"
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:202
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 msgid "Display Cards?"
 msgstr "显示卡片？"
 
 # mail/mail-config.glade.h:28
 # mail/mail-config.glade.h:28
 # addressbook/gui/widgets/e-addressbook-util.c:203
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 msgid "Display Cards"
 msgstr "显示卡片"
 
 # addressbook/gui/widgets/e-addressbook-util.c:207
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -5072,7 +5054,7 @@ msgstr ""
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "将消息移动到"
@@ -5080,7 +5062,7 @@ msgstr "将消息移动到"
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
 # ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "复制选中的任务"
@@ -5088,7 +5070,7 @@ msgstr "复制选中的任务"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "没有卡片"
@@ -5096,7 +5078,7 @@ msgstr "没有卡片"
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
 # addressbook/gui/widgets/e-addressbook-model.c:127
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "没有卡片"
@@ -5235,7 +5217,7 @@ msgstr "地址簿"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "保存为 VCard"
 
@@ -5308,7 +5290,7 @@ msgstr "Pilot 设置(_P)..."
 # addressbook/gui/widgets/e-addressbook-view.c:835
 # ui/evolution-addressbook.xml.h:10
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "转发联系人"
 
@@ -5338,8 +5320,8 @@ msgstr "给联系人发邮件"
 # ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 # ui/my-evolution.xml.h:2
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "打印"
@@ -5376,7 +5358,7 @@ msgstr "移动到文件夹(_M)..."
 # addressbook/gui/widgets/e-addressbook-view.c:841
 # ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:7
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
 
@@ -5400,7 +5382,7 @@ msgstr "复制"
 # addressbook/gui/widgets/e-addressbook-view.c:843
 # ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:13
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "粘贴"
 
@@ -5421,9 +5403,9 @@ msgstr "粘贴"
 # mail/mail-accounts.c:296 ui/evolution-addressbook.xml.h:8
 # ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 # ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
@@ -5433,7 +5415,7 @@ msgstr "删除"
 # widgets/menus/gal-view-menus.c:195
 # widgets/menus/gal-view-menus.c:195
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "当前视图(_C)"
@@ -5710,7 +5692,7 @@ msgstr "列数："
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "选项"
 
@@ -5870,7 +5852,7 @@ msgstr "无标题约会"
 # calendar/gui/e-calendar-table.c:406 mail/message-list.c:679
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "高"
 
@@ -5887,9 +5869,9 @@ msgstr "高"
 # calendar/gui/dialogs/task-details-page.glade.h:9
 # calendar/gui/e-calendar-table.c:407 mail/message-list.c:678
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "中"
 
@@ -5904,7 +5886,7 @@ msgstr "中"
 # calendar/gui/e-calendar-table.c:408 mail/message-list.c:677
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "低"
 
@@ -5919,7 +5901,7 @@ msgstr "低"
 # calendar/gui/e-calendar-table.c:409
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "未定义"
@@ -6133,14 +6115,14 @@ msgstr "编辑约会(_E)"
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:670
 # calendar/gui/alarm-notify/alarm-queue.c:675
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "没有描述。"
 
 # calendar/gui/alarm-notify/alarm-queue.c:730
 # calendar/gui/alarm-notify/alarm-queue.c:730
 # calendar/gui/alarm-notify/alarm-queue.c:735
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -6157,8 +6139,8 @@ msgstr ""
 # calendar/gui/alarm-notify/alarm-queue.c:753
 # calendar/gui/tasks-control.c:426 mail/mail-callbacks.c:2283
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "警告"
@@ -6166,7 +6148,7 @@ msgstr "警告"
 # calendar/gui/alarm-notify/alarm-queue.c:781
 # calendar/gui/alarm-notify/alarm-queue.c:781
 # calendar/gui/alarm-notify/alarm-queue.c:758
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -6185,7 +6167,7 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/alarm-notify/alarm-queue.c:772
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问该问题。"
 
@@ -6234,7 +6216,7 @@ msgstr "注释含有"
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1072
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1074
 # calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "未匹配"
 
@@ -6254,7 +6236,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%b %d %a"
 
@@ -6297,7 +6279,7 @@ msgstr "%B %d"
 # calendar/gui/calendar-commands.c:805
 # calendar/gui/calendar-commands.c:820
 # calendar/gui/calendar-commands.c:820
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
@@ -6308,7 +6290,7 @@ msgstr "无法创建日历视图。 请检查您的 ORBit 和 OAF 设置。"
 # calendar/gui/e-calendar-table.c:384
 # calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
 # calendar/gui/e-calendar-table.c:385
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "保密"
@@ -6319,7 +6301,7 @@ msgstr "保密"
 # calendar/gui/e-calendar-table.c:385
 # calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
 # calendar/gui/e-calendar-table.c:386
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "机密"
@@ -6365,7 +6347,7 @@ msgstr "西"
 # calendar/gui/e-calendar-table.c:457
 # calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 # calendar/gui/e-calendar-table.c:458
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "放假"
@@ -6381,7 +6363,7 @@ msgstr "放假"
 # shell/evolution-shell-component.c:1042
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "繁忙"
 
@@ -6394,8 +6376,8 @@ msgstr "繁忙"
 # calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
 # calendar/gui/dialogs/task-details-page.glade.h:10
 # calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "尚未开始"
@@ -6409,7 +6391,7 @@ msgstr "尚未开始"
 # calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
 # calendar/gui/dialogs/task-details-page.glade.h:7
 # calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
@@ -6427,7 +6409,7 @@ msgstr "正在进行中"
 # calendar/gui/dialogs/task-details-page.glade.h:4
 # calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -6437,7 +6419,7 @@ msgstr "已完成"
 # calendar/gui/calendar-model.c:1052
 # calendar/gui/calendar-model.c:1052
 # calendar/gui/calendar-model.c:1052
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6469,13 +6451,12 @@ msgstr ""
 # widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 # widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
@@ -6484,14 +6465,14 @@ msgstr "无"
 # calendar/gui/calendar-model.c:1713
 # calendar/gui/calendar-model.c:1713
 # calendar/gui/calendar-model.c:1713
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "正在重复"
 
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
 # calendar/gui/calendar-model.c:1715
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "已分派"
 
@@ -6504,9 +6485,9 @@ msgstr "已分派"
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:301
 # calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:536
 # calendar/gui/e-meeting-model.c:810
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "是"
 
@@ -6516,36 +6497,36 @@ msgstr "是"
 # calendar/gui/e-meeting-model.c:811
 # calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:313
 # calendar/gui/e-meeting-model.c:811
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "否"
 
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
 # calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "日视图"
 
 # calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 # calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
 # calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "周工作视图"
 
 # calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 # calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
 # calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "周视图"
 
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
 # calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "月视图"
 
@@ -6556,8 +6537,8 @@ msgstr "月视图"
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "日历"
 
@@ -6580,12 +6561,12 @@ msgstr "文件夹含有约会和事件"
 # my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
 # shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "任务"
 
@@ -6596,10 +6577,33 @@ msgstr "任务"
 msgid "Folder containing to-do items"
 msgstr "文件夹含有 to-do 项"
 
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+# ui/evolution-calendar.xml.h:21
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "新建约会"
+
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "约会"
+
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
 # my-evolution/my-evolution.glade.h:10
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "新闻来源设置"
@@ -6613,15 +6617,26 @@ msgstr "新闻来源设置"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "会见"
 
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "创建新任务"
+
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "新建任务"
@@ -6629,14 +6644,24 @@ msgstr "新建任务"
 # ui/evolution-tasks.xml.h:18
 # ui/evolution-tasks.xml.h:18
 # ui/evolution-tasks.xml.h:22
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "任务(_T)"
 
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:5
+# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
+# ui/evolution-tasks.xml.h:6
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "创建新任务"
+
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
 # ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "新建约会"
@@ -6644,26 +6669,18 @@ msgstr "新建约会"
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "新建约会(_A)"
 
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-# ui/evolution-calendar.xml.h:21
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "New appointment"
-msgstr "新建约会"
-
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-# calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
-#: calendar/gui/component-factory.c:716
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "约会"
+msgid "Create a new all-day appointment"
+msgstr "创建新约会"
 
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
@@ -6779,7 +6796,8 @@ msgstr "使用这些参数："
 # calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 # calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
 # calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "天数"
 
@@ -6793,7 +6811,8 @@ msgstr "每个额外时间"
 # calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 # calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 # calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "小时"
 
@@ -6801,7 +6820,8 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
 # calendar/gui/dialogs/alarm-options.glade.h:11
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "分钟"
 
@@ -7031,7 +7051,7 @@ msgstr "提示器"
 # calendar/gui/e-itip-control.c:748 calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -7084,7 +7104,7 @@ msgstr "小时"
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:120
 # calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:129
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -7397,7 +7417,7 @@ msgstr "星期五(_F)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "常规(_G)"
 
@@ -7469,31 +7489,42 @@ msgstr "星期三(_W)"
 msgid "before every appointment"
 msgstr "在约会开始以前"
 
-# calendar/gui/dialogs/cancel-comp.c:51
-# calendar/gui/dialogs/cancel-comp.c:51
-# calendar/gui/dialogs/cancel-comp.c:51
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "会见状态已经改变。发送更新后的版本？"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
 # calendar/gui/dialogs/cancel-comp.c:57
 # calendar/gui/dialogs/cancel-comp.c:57
 # calendar/gui/dialogs/cancel-comp.c:57
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "您确信您希望取消并删除该会见？"
 
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
 # calendar/gui/dialogs/cancel-comp.c:62
 # calendar/gui/dialogs/cancel-comp.c:62
 # calendar/gui/dialogs/cancel-comp.c:62
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "您确信您希望取消并删除该任务？"
 
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
 # calendar/gui/dialogs/cancel-comp.c:67
 # calendar/gui/dialogs/cancel-comp.c:67
 # calendar/gui/dialogs/cancel-comp.c:67
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "您确信您希望取消并删除该日志条目？"
 
@@ -7609,23 +7640,23 @@ msgstr "预定 "
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "无法更新对象！"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:303
 # calendar/gui/dialogs/comp-editor.c:321
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "无法更新对象！"
@@ -7633,14 +7664,14 @@ msgstr "无法更新对象！"
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:678
 # calendar/gui/dialogs/comp-editor.c:692
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:683
 # calendar/gui/dialogs/comp-editor.c:697
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
@@ -7648,7 +7679,7 @@ msgstr "约会 - %s"
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:686
 # calendar/gui/dialogs/comp-editor.c:700
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
@@ -7656,7 +7687,7 @@ msgstr "任务 - %s"
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:689
 # calendar/gui/dialogs/comp-editor.c:703
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
@@ -7664,22 +7695,22 @@ msgstr "日志条目 - %s"
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:703
 # calendar/gui/dialogs/comp-editor.c:717
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "没有概要"
 
 # composer/e-msg-composer.c:943
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "另存为..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
@@ -7687,7 +7718,7 @@ msgstr ""
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1272
 # calendar/gui/dialogs/comp-editor.c:1277
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "无法获取当前版本！"
 
@@ -8081,7 +8112,7 @@ msgstr "成员"
 # calendar/gui/e-itip-control.c:809
 # calendar/gui/e-meeting-time-sel.etspec.h:8
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -8111,7 +8142,7 @@ msgstr "角色"
 # mail/message-list.etspec.h:9
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
@@ -8244,7 +8275,7 @@ msgstr "在"
 msgid "first"
 msgstr "霭"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "秒"
 
@@ -8297,7 +8328,7 @@ msgstr "其它传真"
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
 # calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "天"
 
@@ -8467,10 +8498,22 @@ msgstr "% 完成"
 msgid "Date Completed:"
 msgstr "完成日期："
 
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
+# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "需要动作"
+
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
 # calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "进度"
 
@@ -8480,22 +8523,22 @@ msgstr "进度"
 # my-evolution/e-summary-preferences.c:964
 # calendar/gui/dialogs/task-details-page.glade.h:12
 # my-evolution/e-summary-preferences.c:966
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "URL："
 
 # calendar/gui/dialogs/task-details-page.glade.h:14
 # calendar/gui/dialogs/task-details-page.glade.h:14
 # calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "状态(_S)："
 
@@ -8533,7 +8576,7 @@ msgstr "分派"
 # calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:757
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:31
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -8647,8 +8690,8 @@ msgstr "100%"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
@@ -8661,16 +8704,16 @@ msgstr "删除选中的对象"
 # calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
 # calendar/gui/e-week-view.c:3432 mail/folder-browser.c:1455
 # shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:37
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "打开(_O)"
 
 # composer/e-msg-composer.c:943
 # composer/e-msg-composer.c:947
 # composer/e-msg-composer.c:912
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "另存为..."
@@ -8684,10 +8727,10 @@ msgstr "另存为..."
 # ui/evolution-addressbook.xml.h:39 ui/evolution-calendar.xml.h:41
 # ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:105
 # ui/my-evolution.xml.h:7
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "打印(_P)..."
@@ -8701,8 +8744,8 @@ msgstr "打印(_P)..."
 # calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
 # calendar/gui/e-week-view.c:3441 ui/evolution-addressbook.xml.h:1
 # ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
@@ -8719,8 +8762,8 @@ msgstr "剪切(_U)"
 # calendar/gui/e-week-view.c:3443 ui/evolution-addressbook.xml.h:34
 # ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 # ui/evolution-tasks.xml.h:17
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
@@ -8741,9 +8784,9 @@ msgstr "复制(_C)"
 # calendar/gui/e-week-view.c:3445 ui/evolution-addressbook.xml.h:38
 # ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 # ui/evolution-tasks.xml.h:21
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -8752,7 +8795,7 @@ msgstr "粘贴(_P)"
 # ui/evolution-task-editor.xml.h:1
 # ui/evolution-task-editor.xml.h:1
 # ui/evolution-task-editor.xml.h:1
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "委派任务"
@@ -8760,7 +8803,7 @@ msgstr "委派任务"
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_C)"
@@ -8768,14 +8811,14 @@ msgstr "作为 iCalendar 转发(_C)"
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:954
 # calendar/gui/e-calendar-table.c:973
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:959
 # calendar/gui/e-calendar-table.c:978
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
@@ -8783,7 +8826,7 @@ msgstr "把任务标记为完成(_M)"
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:961
 # calendar/gui/e-calendar-table.c:980
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
@@ -8793,8 +8836,8 @@ msgstr "删除选定的任务(_D)"
 # calendar/gui/e-week-view.c:3924
 # calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7137
 # calendar/gui/e-week-view.c:3928
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr "更新对象"
 
@@ -8804,7 +8847,7 @@ msgstr "更新对象"
 # calendar/gui/e-calendar-table.etspec.h:6
 # calendar/gui/e-calendar-table.c:1247
 # calendar/gui/e-calendar-table.etspec.h:6
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "点击以添加任务"
@@ -8822,8 +8865,8 @@ msgstr "提醒"
 # camel/camel-filter-driver.c:886
 # calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:924
 # camel/camel-filter-driver.c:1026
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "完成"
 
@@ -8878,11 +8921,9 @@ msgstr "开始日期"
 # calendar/gui/e-calendar-table.etspec.h:16
 # my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
 # shell/e-storage-set-view.c:1483 shell/e-summary-storage.c:79
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "概要"
 
@@ -8954,7 +8995,7 @@ msgstr "%02i 分钟分割"
 # calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
 #. 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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%B %d %A"
@@ -8967,7 +9008,7 @@ msgstr "%B %d %A"
 # calendar/gui/e-week-view-main-item.c:347
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%b %d"
@@ -8979,7 +9020,7 @@ msgstr "%b %d"
 # calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
 # calendar/gui/print.c:768
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "上午"
@@ -8991,7 +9032,7 @@ msgstr "上午"
 # calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
 # calendar/gui/print.c:770
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "下午"
@@ -8999,14 +9040,14 @@ msgstr "下午"
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3523
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
 # calendar/gui/component-factory.c:643 calendar/gui/e-day-view.c:3525
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "新建约会(_A)"
 
 # calendar/gui/e-day-view.c:3525 calendar/gui/e-week-view.c:3404
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3410
 # calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3414
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
@@ -9019,7 +9060,7 @@ msgstr "新建全天事件(_E)"
 # calendar/gui/dialogs/event-editor.c:207
 # calendar/gui/dialogs/event-editor.c:263
 # calendar/gui/dialogs/event-editor.c:366
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "会见"
@@ -9027,14 +9068,14 @@ msgstr "会见"
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:10
 # ui/evolution-calendar.xml.h:22 ui/evolution-tasks.xml.h:12
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "新建任务"
 
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
 # ui/evolution-comp-editor.xml.h:11
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "打印..."
 
@@ -9044,7 +9085,7 @@ msgstr "打印..."
 # ui/evolution-calendar.xml.h:17
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3424
 # ui/evolution-calendar.xml.h:17
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
@@ -9052,14 +9093,14 @@ msgstr "转到今天(_T)"
 # calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3416
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3422
 # calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3426
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-calendar.xml.h:42
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
@@ -9067,8 +9108,7 @@ msgstr "发布忙闲信息(_P)"
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "配置 %s"
@@ -9076,7 +9116,7 @@ msgstr "配置 %s"
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # executive-summary/component/e-summary-url.c:80
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "配置 %s"
@@ -9084,15 +9124,15 @@ msgstr "配置 %s"
 # mail/folder-browser.c:1449 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:105
 # mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:107
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:7
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_M)"
@@ -9100,7 +9140,7 @@ msgstr "调度会议(_M)"
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 # ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_C)"
@@ -9108,37 +9148,37 @@ msgstr "作为 iCalendar 转发(_C)"
 # calendar/gui/e-day-view.c:3565 calendar/gui/e-week-view.c:3449
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3455
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3459
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "使该事件可移动(_M)"
 
 # calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3451
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3457
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3461
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "删除该时间(_O)"
 
 # calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3453
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3459
 # calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3463
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "删除所有事件(_A)"
 
 # shell/e-shell-view-menu.c:577
 # shell/e-shell-view-menu.c:577
 # shell/e-shell-view-menu.c:577
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具好像并未安装到系统中。"
 
 # shell/e-shell-view-menu.c:585
 # shell/e-shell-view-menu.c:585
 # shell/e-shell-view-menu.c:585
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "执行 %s 错误。"
@@ -9209,7 +9249,7 @@ msgstr "任务到期时间：<b>"
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:626 calendar/gui/e-itip-control.c:675
 # calendar/gui/e-itip-control.c:629 calendar/gui/e-itip-control.c:678
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
@@ -9224,7 +9264,7 @@ msgstr "iCalendar 错误"
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:706 calendar/gui/e-itip-control.c:722
 # calendar/gui/e-itip-control.c:709 calendar/gui/e-itip-control.c:725
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 msgid "An unknown person"
 msgstr "未知的人"
 
@@ -9232,7 +9272,7 @@ msgstr "未知的人"
 # calendar/gui/e-itip-control.c:729
 # calendar/gui/e-itip-control.c:732
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -9241,14 +9281,22 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:745
 # calendar/gui/e-itip-control.c:748
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
+# calendar/gui/dialogs/event-page.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:8
+# calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr "地理位置(_O)："
+
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
 # calendar/gui/dialogs/task-details-page.glade.h:15
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:910
 msgid "Status:"
 msgstr "状态："
 
@@ -9258,16 +9306,16 @@ msgstr "状态："
 # calendar/gui/e-meeting-model.c:824
 # calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:344
 # calendar/gui/e-meeting-model.c:824
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -9277,9 +9325,9 @@ msgstr "暂时接受"
 # calendar/gui/e-meeting-model.c:825
 # calendar/gui/e-meeting-model.c:323 calendar/gui/e-meeting-model.c:346
 # calendar/gui/e-meeting-model.c:825
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "否决"
 
@@ -9302,13 +9350,13 @@ msgstr "否决"
 # camel/providers/smtp/camel-smtp-transport.c:171
 # camel/providers/smtp/camel-smtp-transport.c:226
 # widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:442
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "未知"
@@ -9322,16 +9370,16 @@ msgstr "未知"
 # calendar/gui/e-itip-control.c:789 calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:821 calendar/gui/e-itip-control.c:834
 # calendar/gui/e-itip-control.c:847 calendar/gui/e-itip-control.c:860
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 msgid "Update"
 msgstr "更新"
 
@@ -9347,67 +9395,67 @@ msgstr "更新"
 # calendar/gui/e-itip-control.c:823 calendar/gui/e-itip-control.c:836
 # calendar/gui/e-itip-control.c:849 calendar/gui/e-itip-control.c:862
 # shell/e-shell.c:1885 widgets/misc/e-cell-date-edit.c:258
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "确定"
 
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:803
 # calendar/gui/e-itip-control.c:806
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 msgid "Accept"
 msgstr "接受"
 
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:804
 # calendar/gui/e-itip-control.c:807
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:805
 # calendar/gui/e-itip-control.c:808
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 msgid "Decline"
 msgstr "否决"
 
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:819
 # calendar/gui/e-itip-control.c:822
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:832
 # calendar/gui/e-itip-control.c:835
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:846
 # calendar/gui/e-itip-control.c:848
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:860 ui/evolution-mail-global.xml.h:1
 # calendar/gui/e-itip-control.c:861 ui/evolution-mail-global.xml.h:1
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:875
 # calendar/gui/e-itip-control.c:909
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
@@ -9415,14 +9463,14 @@ msgstr "<b>%s</b> 发布了会议信息。"
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:876
 # calendar/gui/e-itip-control.c:910
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "会议信息"
 
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:880
 # calendar/gui/e-itip-control.c:914
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
@@ -9430,14 +9478,14 @@ msgstr "<b>%s</b> 请求您参加一个会议。"
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:881
 # calendar/gui/e-itip-control.c:915
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:885
 # calendar/gui/e-itip-control.c:919
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已存的会议。"
@@ -9445,14 +9493,14 @@ msgstr "<b>%s</b> 希望加入到已存的会议。"
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:886
 # calendar/gui/e-itip-control.c:920
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "会议更新"
 
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:890
 # calendar/gui/e-itip-control.c:924
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 想收到最新的会议信息。"
@@ -9460,14 +9508,14 @@ msgstr "<b>%s</b> 想收到最新的会议信息。"
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:891
 # calendar/gui/e-itip-control.c:925
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:895
 # calendar/gui/e-itip-control.c:948
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
@@ -9475,14 +9523,14 @@ msgstr "<b>%s</b> 已回复一个会议请求。"
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:896
 # calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "会议答复"
 
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:900
 # calendar/gui/e-itip-control.c:953
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
@@ -9490,7 +9538,7 @@ msgstr "<b>%s</b> 取消了一个会议。"
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:901
 # calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
@@ -9500,8 +9548,8 @@ msgstr "会议取消"
 # calendar/gui/e-itip-control.c:990
 # calendar/gui/e-itip-control.c:958 calendar/gui/e-itip-control.c:1029
 # calendar/gui/e-itip-control.c:1064
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信息。"
@@ -9509,14 +9557,14 @@ msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:906
 # calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "错误的会议信息"
 
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:925
 # calendar/gui/e-itip-control.c:979
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
@@ -9524,14 +9572,14 @@ msgstr "<b>%s</b> 发布了任务信息。"
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:926
 # calendar/gui/e-itip-control.c:980
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "任务信息"
 
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:930
 # calendar/gui/e-itip-control.c:984
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
@@ -9539,14 +9587,14 @@ msgstr "<b>%s</b> 请求您完成一个任务。"
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:931
 # calendar/gui/e-itip-control.c:985
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "任务建议"
 
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:935
 # calendar/gui/e-itip-control.c:989
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s<b> 希望加入到已存在的任务。"
@@ -9554,14 +9602,14 @@ msgstr "<b>%s<b> 希望加入到已存在的任务。"
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:936
 # calendar/gui/e-itip-control.c:990
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "任务更新"
 
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:940
 # calendar/gui/e-itip-control.c:994
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
@@ -9569,14 +9617,14 @@ msgstr "<b>%s</b> 希望获取最新的任务信息。"
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:941
 # calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:945
 # calendar/gui/e-itip-control.c:1019
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
@@ -9584,14 +9632,14 @@ msgstr "<b>%s</b> 已经回复了任务委派。"
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:946
 # calendar/gui/e-itip-control.c:1020
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "任务回复"
 
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:950
 # calendar/gui/e-itip-control.c:1024
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
@@ -9599,21 +9647,21 @@ msgstr "<b>%s</b> 取消了任务。"
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:951
 # calendar/gui/e-itip-control.c:1025
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "任务取消"
 
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:956
 # calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "错误的任务邮件"
 
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:975
 # calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
@@ -9621,14 +9669,14 @@ msgstr "<b>%s</b> 发布了忙闲信息。"
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:976
 # calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:980
 # calendar/gui/e-itip-control.c:1054
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
@@ -9636,14 +9684,14 @@ msgstr "<b>%s</b> 请求您的忙闲信息。"
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:981
 # calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "忙闲请求"
 
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:985
 # calendar/gui/e-itip-control.c:1059
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
@@ -9651,136 +9699,136 @@ msgstr "<b>%s</b> 应答了忙闲请求。"
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:986
 # calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:991
 # calendar/gui/e-itip-control.c:1065
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信息"
 
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 msgid "The message does not appear to be properly formed"
 msgstr "邮件的格式可能不正确"
 
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1083
 # calendar/gui/e-itip-control.c:1157
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 msgid "The message contains only unsupported requests."
 msgstr "邮件只含有不支持的请求。"
 
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1111 calendar/gui/e-itip-control.c:1117
 # calendar/gui/e-itip-control.c:1185 calendar/gui/e-itip-control.c:1191
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日程信息"
 
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1142
 # calendar/gui/e-itip-control.c:1216
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日程项目"
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "无法发送项目！\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1243
 # calendar/gui/e-itip-control.c:1317
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1241
 # calendar/gui/e-itip-control.c:1315
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 msgid "Calendar file could not be updated!\n"
 msgstr "无法更新日历文件！\n"
 
 # calendar/gui/e-itip-control.c:1300
 # calendar/gui/e-itip-control.c:1300
 # calendar/gui/e-itip-control.c:1374
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1288
 # calendar/gui/e-itip-control.c:1362
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1298
 # calendar/gui/e-itip-control.c:1372
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1296
 # calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1328
 # calendar/gui/e-itip-control.c:1402
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "删除完成"
 
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1411
 # calendar/gui/e-itip-control.c:1421 calendar/gui/e-itip-control.c:1471
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1363 calendar/gui/e-itip-control.c:1415
 # calendar/gui/e-itip-control.c:1423 calendar/gui/e-itip-control.c:1475
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "选择文件夹"
@@ -9788,7 +9836,7 @@ msgstr "选择文件夹"
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "选择文件夹"
@@ -9867,7 +9915,7 @@ msgstr "主席人员"
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1550
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
 # calendar/gui/e-meeting-model.c:96 calendar/gui/e-meeting-model.c:1568
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "必需的参与者"
 
@@ -9892,7 +9940,7 @@ msgstr "不参加"
 # calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
 # calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:778
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "个人"
 
@@ -9903,7 +9951,7 @@ msgstr "个人"
 # calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
 # calendar/gui/e-meeting-model.c:779
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "组"
 
@@ -9914,7 +9962,7 @@ msgstr "组"
 # calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
 # calendar/gui/e-meeting-model.c:780
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "资源"
 
@@ -9925,7 +9973,7 @@ msgstr "资源"
 # calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
 # calendar/gui/e-meeting-model.c:781
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "房间"
 
@@ -9936,7 +9984,7 @@ msgstr "房间"
 # calendar/gui/e-meeting-model.c:267 calendar/gui/e-meeting-model.c:284
 # calendar/gui/e-meeting-model.c:794
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "主席"
 
@@ -9947,7 +9995,7 @@ msgstr "主席"
 # calendar/gui/e-meeting-model.c:269 calendar/gui/e-meeting-model.c:286
 # calendar/gui/e-meeting-model.c:534 calendar/gui/e-meeting-model.c:795
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "必需的参与者"
 
@@ -9958,7 +10006,7 @@ msgstr "必需的参与者"
 # calendar/gui/e-meeting-model.c:271 calendar/gui/e-meeting-model.c:288
 # calendar/gui/e-meeting-model.c:796
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
@@ -9969,21 +10017,10 @@ msgstr "可选的参与者"
 # calendar/gui/e-meeting-model.c:273 calendar/gui/e-meeting-model.c:290
 # calendar/gui/e-meeting-model.c:797
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "不参加"
 
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-# calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:342
-# calendar/gui/e-meeting-model.c:542 calendar/gui/e-meeting-model.c:823
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "需要动作"
-
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:428
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
@@ -9991,7 +10028,7 @@ msgstr "需要动作"
 # calendar/gui/e-meeting-model.c:325 calendar/gui/e-meeting-model.c:348
 # calendar/gui/e-meeting-model.c:826 calendar/gui/e-meeting-time-sel.c:431
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "暂时的"
 
@@ -10002,7 +10039,7 @@ msgstr "暂时的"
 # calendar/gui/e-meeting-model.c:327 calendar/gui/e-meeting-model.c:350
 # calendar/gui/e-meeting-model.c:827
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -10164,7 +10201,8 @@ msgstr "会议结束时间(_E)："
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:328
 # calendar/gui/e-tasks.c:342
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -10172,7 +10210,7 @@ msgstr "在 %s 打开任务"
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:355
 # calendar/gui/e-tasks.c:367
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "无法从“%s”中装入任务"
@@ -10180,7 +10218,7 @@ msgstr "无法从“%s”中装入任务"
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:367
 # calendar/gui/e-tasks.c:379
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "不支持装入“%s”必需的方法"
@@ -10188,7 +10226,7 @@ msgstr "不支持装入“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "无法打开“%s”中的文件夹"
@@ -10196,7 +10234,7 @@ msgstr "无法打开“%s”中的文件夹"
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
 # calendar/gui/e-calendar-table.etspec.h:8
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "完成日期"
@@ -10207,7 +10245,7 @@ msgstr "完成日期"
 # calendar/gui/e-week-view.c:1824
 # calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
 # calendar/gui/e-week-view.c:1828
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "删除选中的对象"
@@ -10215,24 +10253,17 @@ msgstr "删除选中的对象"
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # calendar/gui/e-tasks.c:629
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 msgid "Expunging"
 msgstr "正在删除"
 
 # calendar/gui/e-week-view.c:3402 calendar/gui/e-week-view.c:3440
 # calendar/gui/e-week-view.c:3408 calendar/gui/e-week-view.c:3446
 # calendar/gui/e-week-view.c:3412 calendar/gui/e-week-view.c:3450
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
-# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "删除该约会(_D)"
-
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1499
 # calendar/gui/gnome-cal.c:1493
@@ -10252,11 +10283,19 @@ msgstr "不支持打开“%s”必需的方法"
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1865
 # calendar/gui/gnome-cal.c:1859
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "从 %s 打开日历"
 
+# mail/mail-ops.c:1234
+# mail/mail-ops.c:1236
+# mail/mail-ops.c:1279
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "正在打开文件夹 %s"
+
 # calendar/gui/goto-dialog.glade.h:1
 # calendar/gui/goto-dialog.glade.h:1
 # calendar/gui/goto-dialog.glade.h:1
@@ -10358,56 +10397,56 @@ msgstr "九月"
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
 # calendar/gui/itip-utils.c:243
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
 # calendar/gui/itip-utils.c:274
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
 # calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:355
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 msgid "Event information"
 msgstr "事件信息"
 
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
 # calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:357
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 msgid "Task information"
 msgstr "任务信息"
 
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
 # calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:359
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 msgid "Journal information"
 msgstr "日志信息"
 
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
 # calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:376
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
 # calendar/gui/itip-utils.c:321
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 msgid "Calendar information"
 msgstr "日历信息"
 
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:787
 # calendar/gui/e-itip-control.c:790
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "更新"
@@ -10415,26 +10454,65 @@ msgstr "更新"
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
 # ui/evolution-subscribe.xml.h:3
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "刷新列表"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:573
 # calendar/gui/itip-utils.c:581
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的参与者。"
 
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1533
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1449
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1538
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1546
+# calendar/conduits/todo/todo-conduit.c:1130
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1721
+# addressbook/gui/component/addressbook-factory.c:50
+# calendar/conduits/calendar/calendar-conduit.c:1727
+# calendar/conduits/todo/todo-conduit.c:1316
+# calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
+# tools/evolution-addressbook-abuse.c:132
+# tools/evolution-addressbook-export.c:60
+# tools/evolution-addressbook-import.c:86
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "无法初始化 Bonobo"
+
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
 # calendar/gui/main.c:91
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "无法创建组件编辑器车间"
 
@@ -10832,9 +10910,8 @@ msgstr "打印日历"
 # mail/mail-callbacks.c:2597 my-evolution/e-summary.c:605
 # ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:68
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "打印预览"
 
@@ -10884,8 +10961,8 @@ msgstr ""
 # mail/mail-callbacks.c:2142
 # mail/mail-callbacks.c:2261
 # calendar/gui/tasks-control.c:441 mail/mail-callbacks.c:2297
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
@@ -10969,10 +11046,43 @@ msgstr "将 iCalendar 文件导入 Evolution"
 msgid "Imports vCalendar files into Evolution"
 msgstr "将 iCalendar 文件导入 Evolution"
 
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+# camel/providers/local/camel-mbox-folder.c:347
+# camel/providers/local/camel-mbox-folder.c:379
+# camel/providers/local/camel-mbox-folder.c:391
+# camel/providers/local/camel-spool-folder.c:595
+# camel/providers/local/camel-spool-folder.c:627
+# camel/providers/local/camel-spool-folder.c:639
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件： %1$s\n"
+"  %3$s"
+
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+# mail/component-factory.c:129
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "无法连接到存储： %s"
+
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
 # calendar/gui/dialogs/event-editor.c:190
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "提醒"
@@ -10980,7 +11090,7 @@ msgstr "提醒"
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "日历消息"
@@ -10988,7 +11098,7 @@ msgstr "日历消息"
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
 # importers/pine-importer.c:663
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -11003,7 +11113,7 @@ msgstr ""
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "日历"
@@ -11011,133 +11121,133 @@ msgstr "日历"
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
 # calendar/pcs/query.c:246
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now 需要 0 个参数"
 
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
 # calendar/pcs/query.c:270
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time 需要 1 个参数"
 
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
 # calendar/pcs/query.c:275
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
 # calendar/pcs/query.c:283
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time 的第一个参数必须是 ISO 8601 日期/时间字符串"
 
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
 # calendar/pcs/query.c:312
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day 需要 2 个参数"
 
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
 # calendar/pcs/query.c:317
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
 # calendar/pcs/query.c:324
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day 的第二个参数应该是整数"
 
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
 # calendar/pcs/query.c:351
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin 需要 1 个参数"
 
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
 # calendar/pcs/query.c:356
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
 # calendar/pcs/query.c:383
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end 需要一个参数"
 
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
 # calendar/pcs/query.c:388
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
 # calendar/pcs/query.c:424
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype 需要 0 个参数"
 
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
 # calendar/pcs/query.c:520
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? 需要两个参数"
 
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
 # calendar/pcs/query.c:525
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
 # calendar/pcs/query.c:532
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-rang? 的第二个参数应该是 time_t"
 
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
 # calendar/pcs/query.c:662
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? 需要 2 个参数"
 
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
 # calendar/pcs/query.c:667
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? 的第一个参数应该是字符串"
 
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
 # calendar/pcs/query.c:674
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? 的第二个参数应该是字符串"
 
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
 # calendar/pcs/query.c:691
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
@@ -11146,14 +11256,14 @@ msgstr "contains? 的第一个参数必须是“任意”、“概要”、“�
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
 # calendar/pcs/query.c:733
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? 至少需要 1 个参数"
 
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
 # calendar/pcs/query.c:745
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -11162,28 +11272,28 @@ msgstr "has-categories? 的所有参数都应该为字符串或者它唯一的�
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
 # calendar/pcs/query.c:833
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? 需要 0 个参数"
 
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
 # calendar/pcs/query.c:878
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 msgid "completed-before? expects 1 argument"
 msgstr "completed-before? 需要 1 个参数"
 
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
 # calendar/pcs/query.c:883
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "completed-before? 的第一个参数应该是 time_t"
 
 # calendar/pcs/query.c:1160
 # calendar/pcs/query.c:1160
 # calendar/pcs/query.c:1160
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "计算搜索表达式没有得到布尔值"
 
@@ -13686,14 +13796,14 @@ msgstr "您必需在线工作以便完成该操作"
 # camel/camel-filter-driver.c:553 camel/camel-filter-driver.c:562
 # camel/camel-filter-driver.c:602 camel/camel-filter-driver.c:611
 # camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "同步文件夹"
 
 # camel/camel-filter-driver.c:921
 # camel/camel-filter-driver.c:970
 # camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "解析过滤规则错误： %s： %s"
@@ -13701,7 +13811,7 @@ msgstr "解析过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:927
 # camel/camel-filter-driver.c:976
 # camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "执行过滤规则错误： %s： %s"
@@ -13709,21 +13819,21 @@ msgstr "执行过滤规则错误： %s： %s"
 # camel/camel-filter-driver.c:664
 # camel/camel-filter-driver.c:713
 # camel/camel-filter-driver.c:865
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "无法打开脱机文件夹"
 
 # camel/camel-filter-driver.c:673
 # camel/camel-filter-driver.c:722
 # camel/camel-filter-driver.c:874
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "无法处理脱机文件夹"
 
 # camel/camel-filter-driver.c:688
 # camel/camel-filter-driver.c:737
 # camel/camel-filter-driver.c:889
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "获取邮件 %d (%d%%)"
@@ -13731,14 +13841,14 @@ msgstr "获取邮件 %d (%d%%)"
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "无法打开消息"
 
 # camel/camel-filter-driver.c:693 camel/camel-filter-driver.c:705
 # camel/camel-filter-driver.c:742 camel/camel-filter-driver.c:754
 # camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "在消息 %d 失败"
@@ -13746,14 +13856,14 @@ msgstr "在消息 %d 失败"
 # camel/camel-filter-driver.c:719 camel/camel-filter-driver.c:832
 # camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:881
 # camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "正在同步文件夹"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # camel/camel-filter-driver.c:988
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "正在获取第 %d 个消息，共 %d 个"
@@ -13761,7 +13871,7 @@ msgstr "正在获取第 %d 个消息，共 %d 个"
 # camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 # camel/camel-filter-driver.c:843 camel/camel-filter-driver.c:861
 # camel/camel-filter-driver.c:1003
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d 个消息失败，共 %d 个"
@@ -13769,10 +13879,26 @@ msgstr "在第 %d 个消息失败，共 %d 个"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-filter-search.c:126
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "检索消息失败。"
 
+# shell/e-shell.c:1886
+# shell/e-shell.c:1886
+# shell/e-shell.c:1887
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "无效参数"
+
+# shell/e-shell.c:1886
+# shell/e-shell.c:1886
+# shell/e-shell.c:1887
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "无效参数"
+
 # camel/providers/imap/camel-imap-message-cache.c:256
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
@@ -13785,7 +13911,7 @@ msgstr "检索消息失败。"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -13802,7 +13928,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -13810,7 +13936,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:502 camel/camel-filter-search.c:509
 # camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误： %s： %s"
@@ -13893,7 +14019,7 @@ msgstr "正在移动邮件"
 msgid "Copying messages"
 msgstr "把邮件复制到 %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -13901,15 +14027,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -13919,20 +14045,20 @@ msgstr ""
 # mail/mail-send-recv.c:533
 # mail/mail-send-recv.c:541
 # mail/mail-send-recv.c:541
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "已取消"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
 # camel/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
 # camel/providers/pop3/camel-pop3-store.c:563
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 POP 服务器的意外应答： %s"
@@ -13940,7 +14066,7 @@ msgstr "来自 POP 服务器的意外应答： %s"
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
 # tools/evolution-addressbook-import.c:80
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "没有提供文件名。"
@@ -13948,7 +14074,7 @@ msgstr "没有提供文件名。"
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
 # camel/camel-pgp-context.c:1169
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "无法加密该邮件： 没有指明收件人"
@@ -13965,7 +14091,7 @@ msgstr "无法加密该邮件： 没有指明收件人"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -13985,7 +14111,7 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -13993,8 +14119,8 @@ msgstr "缓冲邮件 %s 失败： %s"
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
 # camel/camel-smime-context.c:810
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "解码邮件失败。"
@@ -14002,7 +14128,7 @@ msgstr "解码邮件失败。"
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
 # camel/camel-pgp-context.c:970
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "无法验证该邮件：无法创建临时文件： %s"
@@ -14043,7 +14169,7 @@ msgstr "无法锁定“%s”"
 # camel/camel-lock.c:91 camel/camel-lock.c:110
 # camel/camel-lock.c:91 camel/camel-lock.c:110
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "无法为 %s 创建锁定文件： %s"
@@ -14051,7 +14177,7 @@ msgstr "无法为 %s 创建锁定文件： %s"
 # camel/camel-lock.c:150
 # camel/camel-lock.c:150
 # camel/camel-lock.c:150
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
@@ -14059,7 +14185,7 @@ msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
 # camel/camel-lock.c:204
 # camel/camel-lock.c:204
 # camel/camel-lock.c:204
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "用 fcntl(2) 获取锁失败： %s"
@@ -14067,7 +14193,7 @@ msgstr "用 fcntl(2) 获取锁失败： %s"
 # camel/camel-lock.c:266
 # camel/camel-lock.c:266
 # camel/camel-lock.c:266
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "用 flock(2) 获取锁失败： %s"
@@ -14159,12 +14285,18 @@ msgstr "写入邮件临时文件错误： %s"
 msgid "Error copying mail temp file: %s"
 msgstr "复制邮件临时文件错误： %s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
 # camel/camel-pkcs7-context.c:677
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+#, fuzzy
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr "无法解密：未知"
+
+# camel/camel-pkcs7-context.c:677
+#: camel/camel-multipart-encrypted.c:327
 #, fuzzy
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "无法解密：未知"
@@ -14371,7 +14503,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -14649,38 +14781,168 @@ msgstr "无法获取文件夹： 对该存储的无效操作"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹： 对该存储的无效操作"
 
-# camel/camel-tcp-stream-openssl.c:519
-#: camel/camel-tcp-stream-openssl.c:614
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
-"提交者：%s\n"
-"主题：%s"
 
-# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
-# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
-# camel/camel-tcp-stream-openssl.c:524
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:962
+# mail/mail-account-gui.c:959
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "无法保存签名文件。"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "证书 ID(_C)："
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:474
+# shell/e-shell-importer.c:485
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "装入 %s 错误"
+
+# calendar/gui/e-meeting-time-sel.c:430
+# calendar/gui/e-meeting-time-sel.c:433
+# calendar/gui/e-meeting-time-sel.c:433
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "办公室以外"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+# camel/camel-smime-context.c:855
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "验证证书失败。"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "证书 ID(_C)："
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1013
+# shell/evolution-shell-component.c:1026
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "无效参数"
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "证书 ID(_C)："
+
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:95
+# mail/mail-config.glade.h:104
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "证书 ID(_C)："
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
 msgstr ""
-"来自 %s 的错误证书：\n"
-"\n"
-"%s\n"
-"\n"
-"您仍然希望接受吗？"
 
 # camel/camel-tcp-stream-ssl.c:438
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -14694,20 +14956,40 @@ msgstr ""
 "签名：           %s"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "GOOD"
 msgstr "好"
 
 # camel/camel-tcp-stream-ssl.c:444
-#: camel/camel-tcp-stream-ssl.c:501
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
 msgid "BAD"
 msgstr "坏"
 
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
+# camel/camel-tcp-stream-openssl.c:524
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"来自 %s 的错误证书：\n"
+"\n"
+"%s\n"
+"\n"
+"您仍然希望接受吗？"
+
+# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
+# camel/camel-tcp-stream-openssl.c:524 camel/camel-tcp-stream-ssl.c:438
 # camel/camel-tcp-stream-ssl.c:447
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -14730,10 +15012,18 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "无法解析 URL “%s”"
 
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:455
+# shell/e-shell-importer.c:466
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "启动 %s 错误"
+
 # camel/camel-vee-folder.c:588
 # camel/camel-vee-folder.c:588
 # camel/camel-vee-folder.c:588
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "在 %2$s 中没有消息 %1$s"
@@ -14741,7 +15031,7 @@ msgstr "在 %2$s 中没有消息 %1$s"
 # camel/providers/imap/camel-imap-provider.c:45
 # camel/providers/imap/camel-imap-provider.c:45
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "在所有文件夹中检查新邮件"
@@ -14749,7 +15039,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
 # camel/camel-vee-store.c:258
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹： %s： 无效操作"
@@ -14757,7 +15047,7 @@ msgstr "无法删除文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
 # camel/camel-vee-store.c:293
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹： %s： 没有该文件夹"
@@ -14765,7 +15055,7 @@ msgstr "无法删除文件夹： %s： 没有该文件夹"
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
 # camel/camel-vee-store.c:306
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹： %s： 无效操作"
@@ -14773,7 +15063,7 @@ msgstr "无法重命名文件夹： %s： 无效操作"
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
 # camel/camel-vee-store.c:314
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹： %s： 没有该文件夹"
@@ -14793,7 +15083,7 @@ msgstr "无法重命名文件夹： %s： 没有该文件夹"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
@@ -14804,7 +15094,7 @@ msgstr "操作已取消"
 # camel/camel-remote-store.c:484
 # camel/providers/imap/camel-imap-command.c:274
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接： %s"
@@ -14851,7 +15141,7 @@ msgstr "来自 IMAP 服务器意外的 OK 应答： %s"
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:194
 # camel/providers/imap/camel-imap-folder.c:197
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "无法创建目录 %s： %s"
@@ -14859,7 +15149,7 @@ msgstr "无法创建目录 %s： %s"
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:213
 # camel/providers/imap/camel-imap-folder.c:216
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
@@ -14867,7 +15157,7 @@ msgstr "无法为 %s 装入概要"
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:277
 # camel/providers/imap/camel-imap-folder.c:282
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "文件夹已被删除并在服务器上重建了。"
 
@@ -14875,7 +15165,7 @@ msgstr "文件夹已被删除并在服务器上重建了。"
 # camel/providers/imap/camel-imap-folder.c:461
 # camel/providers/imap/camel-imap-folder.c:466
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
@@ -14885,8 +15175,8 @@ msgstr "正在扫描改变了的邮件"
 # camel/providers/imap/camel-imap-folder.c:2001
 # camel/providers/imap/camel-imap-folder.c:1632
 # camel/providers/imap/camel-imap-folder.c:2108
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
@@ -14896,22 +15186,22 @@ msgstr "该邮件目前不可用"
 # camel/providers/imap/camel-imap-folder.c:1821
 # camel/providers/imap/camel-imap-folder.c:1787
 # camel/providers/imap/camel-imap-folder.c:1861
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "从新邮件中获取概要信息"
 
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "正在扫描新邮件"
 
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2038
 # camel/providers/imap/camel-imap-folder.c:2145
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
@@ -14935,10 +15225,10 @@ msgstr "无法打开缓冲器目录： %s"
 # camel/providers/imap/camel-imap-message-cache.c:313
 # camel/providers/imap/camel-imap-message-cache.c:344
 # camel/providers/imap/camel-imap-message-cache.c:376
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "缓冲邮件 %s 失败： %s"
@@ -14960,7 +15250,7 @@ msgstr "在所有文件夹中检查新邮件"
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:832
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "文件夹"
 
@@ -15017,7 +15307,7 @@ msgstr "IMAP 服务器上的邮件的读写。"
 # camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:60
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "密码"
 
@@ -15031,7 +15321,7 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP 服务器 %s"
@@ -15039,7 +15329,7 @@ msgstr "SMTP 服务器 %s"
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
 # camel/camel-remote-store.c:207
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 为 %s 服务，在 %s"
@@ -15047,7 +15337,7 @@ msgstr "%s 为 %s 服务，在 %s"
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
 # camel/camel-remote-store.c:264
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
@@ -15060,9 +15350,8 @@ msgstr "连接已取消"
 # camel/providers/smtp/camel-smtp-transport.c:273
 # camel/camel-remote-store.c:267
 # camel/providers/smtp/camel-smtp-transport.c:276
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
@@ -15071,8 +15360,8 @@ msgstr "无法连接到 %s (端口 %d)： %s"
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -15082,7 +15371,7 @@ msgstr ""
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
@@ -15091,16 +15380,24 @@ msgstr "不支持的操作"
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
 # camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "认证失败。"
 
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+# shell/e-storage.c:510
+#: camel/providers/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "文件夹不为空"
+
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
 # camel/providers/imap/camel-imap-store.c:518
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
@@ -15111,8 +15408,8 @@ msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:389
 # camel/providers/imap/camel-imap-store.c:528
 # camel/providers/smtp/camel-smtp-transport.c:393
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支持验证类型 %s"
@@ -15120,7 +15417,7 @@ msgstr "不支持验证类型 %s"
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
 # camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
@@ -15131,15 +15428,15 @@ msgstr "%s请为 %s@%s 输入 IMAP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:430
 # camel/providers/imap/camel-imap-store.c:567
 # camel/providers/smtp/camel-smtp-transport.c:434
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
 # camel/providers/imap/camel-imap-store.c:596
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -15153,16 +15450,25 @@ msgstr ""
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:899
 # camel/providers/imap/camel-imap-store.c:900
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+# shell/e-shell-utils.c:121
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "文件夹名不能含有回车符。"
+
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1274
 # camel/providers/imap/camel-imap-store.c:1275
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
@@ -15170,7 +15476,7 @@ msgstr "父文件夹不允许含有子文件夹"
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
@@ -15182,8 +15488,8 @@ msgstr "%s (%d)"
 # camel/providers/local/camel-mbox-folder.c:208
 # camel/providers/local/camel-spool-folder.c:456
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "无法打开邮件箱： %s： %s\n"
@@ -15192,7 +15498,7 @@ msgstr "无法打开邮件箱： %s： %s\n"
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -15226,7 +15532,10 @@ msgstr "本地发送"
 # camel/providers/local/camel-local-provider.c:53
 # camel/providers/local/camel-local-provider.c:53
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "在按照标准邮件箱格式化的脱机文件中检索本地邮件。"
 
 # camel/providers/local/camel-local-provider.c:62
@@ -15269,7 +15578,7 @@ msgstr "标准 Unix 邮件箱"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "在标准邮件箱文件中读取和存储本地邮件。"
 
@@ -15283,7 +15592,7 @@ msgstr "在标准邮件箱文件中读取和存储本地邮件。"
 # camel/providers/local/camel-local-store.c:227
 # camel/providers/local/camel-spool-store.c:109
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -15306,9 +15615,9 @@ msgstr "存储根目录 %s 不是普通目录"
 # camel/providers/local/camel-local-store.c:153
 # camel/providers/local/camel-local-store.c:169
 # camel/providers/local/camel-local-store.c:235
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "无法获取文件夹： %s： %s"
@@ -15316,14 +15625,14 @@ msgstr "无法获取文件夹： %s： %s"
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
 # camel/providers/local/camel-local-store.c:184
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "本地存储没有收件箱"
 
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地邮件文件 %s"
@@ -15331,7 +15640,7 @@ msgstr "本地邮件文件 %s"
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
 # camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "无法将文件夹 %s 改名为 %s： %s"
@@ -15339,7 +15648,7 @@ msgstr "无法将文件夹 %s 改名为 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "无法重命名文件夹： %s"
@@ -15347,7 +15656,7 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
 # camel/providers/local/camel-local-store.c:374
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "无法删除文件夹概要文件 “%s”： %s"
@@ -15355,7 +15664,7 @@ msgstr "无法删除文件夹概要文件 “%s”： %s"
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
 # camel/providers/local/camel-local-store.c:384
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "无法删除文件夹索引文件 “%s”： %s"
@@ -15487,7 +15796,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:100
 # camel/providers/local/camel-mh-store.c:96
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -15555,8 +15864,8 @@ msgstr "无法扫描文件夹“%s”： %s"
 # camel/providers/local/camel-maildir-summary.c:526
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "无法打开邮件目录路径： %s： %s"
@@ -15564,7 +15873,7 @@ msgstr "无法打开邮件目录路径： %s： %s"
 # camel/providers/imap/camel-imap-provider.c:43
 # camel/providers/imap/camel-imap-provider.c:43
 # camel/providers/imap/camel-imap-provider.c:43
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "正在检查新邮件"
@@ -15572,7 +15881,7 @@ msgstr "正在检查新邮件"
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1746
 # camel/providers/imap/camel-imap-folder.c:1793
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "正在扫描新邮件"
@@ -15595,10 +15904,10 @@ msgstr "正在扫描新邮件"
 # camel/providers/local/camel-spool-summary.c:378
 # camel/providers/local/camel-spool-summary.c:643
 # camel/providers/local/camel-spool-summary.c:935
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "正在存储文件夹"
@@ -15693,7 +16002,7 @@ msgstr "邮件构造失败：邮件箱已损坏？"
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
 # camel/providers/local/camel-mbox-store.c:93
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -15705,7 +16014,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
 # camel/providers/local/camel-mbox-store.c:109
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -15720,8 +16029,8 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:145
 # camel/providers/local/camel-mbox-store.c:118
 # camel/providers/local/camel-mbox-store.c:145
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "“%s”并不是普通文件。"
@@ -15732,8 +16041,8 @@ msgstr "“%s”并不是普通文件。"
 # camel/providers/local/camel-mbox-store.c:160
 # camel/providers/local/camel-mbox-store.c:137
 # camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -15745,7 +16054,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
 # camel/providers/local/camel-mbox-store.c:152
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "文件夹“%s”非空。没有删除。"
@@ -15778,7 +16087,7 @@ msgstr "在文件夹 %2$s 中邻近 %1$ld 的位置出现致命的解析错误"
 # camel/providers/local/camel-spool-summary.c:497
 # camel/providers/local/camel-mbox-summary.c:370
 # camel/providers/local/camel-spool-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "无法检查文件夹： %s： %s"
@@ -15792,8 +16101,8 @@ msgstr "无法检查文件夹： %s： %s"
 # camel/providers/local/camel-mbox-summary.c:502
 # camel/providers/local/camel-mbox-summary.c:703
 # camel/providers/local/camel-spool-summary.c:648
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
@@ -15805,7 +16114,7 @@ msgstr "无法打开文件： %s： %s"
 # camel/providers/local/camel-spool-summary.c:672
 # camel/providers/local/camel-mbox-summary.c:519
 # camel/providers/local/camel-spool-summary.c:672
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -15820,8 +16129,8 @@ msgstr "无法打开临时邮件箱： %s"
 # camel/providers/local/camel-mbox-summary.c:630
 # camel/providers/local/camel-mbox-summary.c:799
 # camel/providers/local/camel-spool-summary.c:1036
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "无法关闭来源文件夹 %s： %s"
@@ -15829,7 +16138,7 @@ msgstr "无法关闭来源文件夹 %s： %s"
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
 # camel/providers/local/camel-mbox-summary.c:639
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "无法关闭临时文件夹： %s"
@@ -15837,7 +16146,7 @@ msgstr "无法关闭临时文件夹： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "无法重命名文件夹： %s"
@@ -15866,10 +16175,10 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-spool-summary.c:705
 # camel/providers/local/camel-spool-summary.c:978
 # camel/providers/local/camel-spool-summary.c:986
-#: camel/providers/local/camel-mbox-summary.c:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "即使同步后，概要和文件夹仍然不匹配"
 
@@ -15882,7 +16191,7 @@ msgstr "即使同步后，概要和文件夹仍然不匹配"
 # camel/providers/local/camel-mbox-summary.c:873
 # camel/providers/local/camel-spool-summary.c:544
 # camel/providers/local/camel-spool-summary.c:1110
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
@@ -15891,7 +16200,7 @@ msgstr "未知的错误： %s"
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
 # camel/providers/local/camel-mbox-summary.c:650
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "无法重命名文件夹： %s"
@@ -15902,7 +16211,7 @@ msgstr "无法重命名文件夹： %s"
 # camel/providers/local/camel-spool-summary.c:749
 # camel/providers/local/camel-mbox-summary.c:595
 # camel/providers/local/camel-spool-summary.c:749
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "写入临时文件夹错误： %s"
@@ -15913,7 +16222,7 @@ msgstr "写入临时文件夹错误： %s"
 # camel/providers/local/camel-spool-summary.c:771
 # camel/providers/local/camel-mbox-summary.c:612
 # camel/providers/local/camel-spool-summary.c:771
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "写入临时文件夹失败： %s： %s"
@@ -16165,7 +16474,7 @@ msgstr "操作失败：%s"
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
 # camel/providers/pop3/camel-pop3-folder.c:175
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "检索 POP 概要"
 
@@ -16178,10 +16487,10 @@ msgstr "检索 POP 概要"
 # camel/providers/imap/camel-imap-command.c:228
 # camel/providers/imap/camel-imap-command.c:409
 # camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "User cancelled"
 msgstr "用户已取消"
 
@@ -16203,7 +16512,7 @@ msgstr "用户已取消"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "无法获取消息 POP 摘要：%s"
@@ -16211,14 +16520,14 @@ msgstr "无法获取消息 POP 摘要：%s"
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
 # camel/providers/pop3/camel-pop3-folder.c:252
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "彻底去除已删除的邮件"
 
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
 # camel/providers/pop3/camel-pop3-folder.c:367
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "没有 uid 为 %s 的邮件"
@@ -16228,7 +16537,7 @@ msgstr "没有 uid 为 %s 的邮件"
 # camel/providers/pop3/camel-pop3-folder.c:371
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "检索 POP 邮件 %d"
@@ -16251,10 +16560,10 @@ msgstr "检索 POP 邮件 %d"
 # camel/providers/local/camel-spool-folder.c:579
 # camel/providers/nntp/camel-nntp-folder.c:153
 # camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s：%s"
@@ -16262,7 +16571,7 @@ msgstr "无法获取消息 %s：%s"
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
 # my-evolution/metar.c:247
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -16291,7 +16600,7 @@ msgstr "%s 天之后删除"
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:51
 # camel/providers/pop3/camel-pop3-provider.c:50 mail/mail-config.glade.h:59
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -16325,6 +16634,17 @@ msgstr ""
 "该选项使 Evolution 在连接到 POP 服务器时使用 APOP 协议。即使是声称支持这一功"
 "能的服务器，也不一定能使所有用户工作。"
 
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:273
+# camel/camel-remote-store.c:267
+# camel/providers/smtp/camel-smtp-transport.c:276
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "无法连接到 %s (端口 %d)： %s"
+
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
@@ -16342,17 +16662,18 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:321
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "无法连接到在 %s 的 POP 服务器。"
 
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 # camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "无法连接到 POP 服务器。\n"
 "不支持所要求的验证机制。"
@@ -16361,26 +16682,27 @@ msgstr ""
 # camel/providers/imap/camel-imap-command.c:362
 # camel/providers/imap/camel-imap-command.c:362
 #: camel/providers/pop3/camel-pop3-store.c:408
-#, c-format
-msgid "SASL `%s' Login failed: %s"
+#, fuzzy, c-format
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL“%s”登录失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
-msgstr "SASL 协议错误"
-
-# shell/e-storage.c:506
-# shell/e-storage.c:506
-# shell/e-storage.c:506
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
-msgid "I/O Error: %s"
-msgstr "输入输出错误：%s"
+msgid "Cannot login to POP server %s: SASL Protocol error"
+msgstr ""
+
+# camel/providers/pop3/camel-pop3-store.c:198
+# camel/providers/pop3/camel-pop3-store.c:198
+# camel/providers/pop3/camel-pop3-store.c:198
+#: camel/providers/pop3/camel-pop3-store.c:436
+#, fuzzy, c-format
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "无法认证到 KPOP 服务器： %s"
 
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
 # camel/providers/pop3/camel-pop3-store.c:360
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 POP 密码"
@@ -16388,11 +16710,11 @@ msgstr "%s请为 %s@%s 输入 POP 密码"
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
 # camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "无法连接到 POP 服务器。\n"
@@ -16401,7 +16723,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
 # camel/providers/pop3/camel-pop3-store.c:480
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -16413,7 +16735,7 @@ msgstr "没有文件夹“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:36
 # mail/mail-config.glade.h:81
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -16452,7 +16774,7 @@ msgstr "无法创建 sendmail 进程： %s： 邮件未发送"
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:149
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "无法发送邮件： %s"
@@ -16460,7 +16782,7 @@ msgstr "无法发送邮件： %s"
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:162
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
@@ -16468,7 +16790,7 @@ msgstr "sendmail 以信号 %s 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:169
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "无法执行 %s： 邮件未发送。"
@@ -16476,7 +16798,7 @@ msgstr "无法执行 %s： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:174
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail 以状态码 %d 退出： 邮件未发送。"
@@ -16484,21 +16806,21 @@ msgstr "sendmail 以状态码 %d 退出： 邮件未发送。"
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:246
 # camel/providers/sendmail/camel-sendmail-transport.c:259
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:248
 # camel/providers/sendmail/camel-sendmail-transport.c:261
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "通过 sendmail 程序发送邮件"
 
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:65
 # camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:74
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -16684,19 +17006,19 @@ msgstr "临时认证失败"
 msgid "Authentication required"
 msgstr "必须认证"
 
-# camel/providers/smtp/camel-smtp-transport.c:317
-# camel/providers/smtp/camel-smtp-transport.c:317
-# camel/providers/smtp/camel-smtp-transport.c:320
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "Welcome 应答错误： %s： 可能不致命"
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1250
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "QUIT 应答错误"
 
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
 # camel/providers/pop3/camel-pop3-store.c:377
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
@@ -16706,7 +17028,7 @@ msgstr ""
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1064
 # calendar/gui/e-itip-control.c:1138
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "邮件的格式可能不正确"
@@ -16714,7 +17036,7 @@ msgstr "邮件的格式可能不正确"
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -16722,7 +17044,7 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1104
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA 应答错误"
@@ -16730,7 +17052,7 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:379
 # camel/providers/smtp/camel-smtp-transport.c:383
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
@@ -16738,7 +17060,7 @@ msgstr "SMTP 服务器 %s 并不支持请求的认证类型 %s"
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:417
 # camel/providers/smtp/camel-smtp-transport.c:421
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 SMTP 密码"
@@ -16746,7 +17068,7 @@ msgstr "%s请为 %s@%s 输入 SMTP 密码"
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:438
 # camel/providers/smtp/camel-smtp-transport.c:442
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -16760,7 +17082,7 @@ msgstr ""
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:554
 # camel/providers/smtp/camel-smtp-transport.c:565
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 服务器 %s"
@@ -16768,7 +17090,7 @@ msgstr "SMTP 服务器 %s"
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:556
 # camel/providers/smtp/camel-smtp-transport.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "通过 %s 发送 SMTP 邮件"
@@ -16776,65 +17098,65 @@ msgstr "通过 %s 发送 SMTP 邮件"
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:588
 # camel/providers/smtp/camel-smtp-transport.c:598
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "无法发送邮件： 发件人地址不合法。"
 
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:558
 # camel/providers/smtp/camel-smtp-transport.c:593 mail/mail-ops.c:560
 # camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "正在发送邮件"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:614
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "无法发送邮件： 没有定义收件人。"
 
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:604
 # camel/providers/smtp/camel-smtp-transport.c:624
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "无法发送消息：一个或多个非法收件人"
 
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:684
 # camel/providers/smtp/camel-smtp-transport.c:798
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP 欢迎"
 
-# camel/providers/smtp/camel-smtp-transport.c:706
-# camel/providers/smtp/camel-smtp-transport.c:706
-# camel/providers/smtp/camel-smtp-transport.c:820
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELLO 请求超时： %s： 非致命"
-
-# camel/providers/smtp/camel-smtp-transport.c:726
-# camel/providers/smtp/camel-smtp-transport.c:726
-# camel/providers/smtp/camel-smtp-transport.c:840
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1091
+# camel/providers/smtp/camel-smtp-transport.c:1199
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "HELLO 应答错误： %s： 非致命"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET 请求超时： %s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1110
+# camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "RSET 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:758
 # camel/providers/smtp/camel-smtp-transport.c:883
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP 认证"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:764
 # camel/providers/smtp/camel-smtp-transport.c:889
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "创建 SASL 认证对象错误。"
 
@@ -16844,8 +17166,8 @@ msgstr "创建 SASL 认证对象错误。"
 # camel/providers/smtp/camel-smtp-transport.c:791
 # camel/providers/smtp/camel-smtp-transport.c:904
 # camel/providers/smtp/camel-smtp-transport.c:916
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH 请求超时： %s"
@@ -16853,21 +17175,21 @@ msgstr "AUTH 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:800
 # camel/providers/smtp/camel-smtp-transport.c:925
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH 请求失败。"
 
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:848
 # camel/providers/smtp/camel-smtp-transport.c:973
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "来自服务器的错误认证应答。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:874
 # camel/providers/smtp/camel-smtp-transport.c:999
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
@@ -16875,20 +17197,20 @@ msgstr "MAIL FROM 请求超时： %s： 邮件未发送"
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:893
 # camel/providers/smtp/camel-smtp-transport.c:1013
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM 应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:918
 # camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO 请求超时： %s： 邮件未发送"
 
 # camel/providers/smtp/camel-smtp-transport.c:1054
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失败"
@@ -16896,7 +17218,7 @@ msgstr "RCPT TO <%s> 失败"
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:971
 # camel/providers/smtp/camel-smtp-transport.c:1090
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA 请求超时： %s： 邮件未发送"
@@ -16907,7 +17229,7 @@ msgstr "DATA 请求超时： %s： 邮件未发送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 msgid "DATA response error"
 msgstr "DATA 应答错误"
 
@@ -16917,8 +17239,8 @@ msgstr "DATA 应答错误"
 # camel/providers/smtp/camel-smtp-transport.c:1048
 # camel/providers/smtp/camel-smtp-transport.c:1144
 # camel/providers/smtp/camel-smtp-transport.c:1162
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
@@ -16928,14 +17250,14 @@ msgstr "DATA 发送超时： 消息终止： %s： 邮件未发送"
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:495
 # camel/providers/smtp/camel-smtp-transport.c:1176
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 msgid "DATA termination response error"
 msgstr "DATA 终止应答错误"
 
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1091
 # camel/providers/smtp/camel-smtp-transport.c:1199
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET 请求超时： %s"
@@ -16943,36 +17265,39 @@ msgstr "RSET 请求超时： %s"
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1213
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 msgid "RSET response error"
 msgstr "RSET 应答错误"
 
-# camel/providers/smtp/camel-smtp-transport.c:1133
-# camel/providers/smtp/camel-smtp-transport.c:1133
-# camel/providers/smtp/camel-smtp-transport.c:1236
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT 请求超时： %s： 非致命"
+# camel/providers/smtp/camel-smtp-transport.c:779
+# camel/providers/smtp/camel-smtp-transport.c:791
+# camel/providers/smtp/camel-smtp-transport.c:779
+# camel/providers/smtp/camel-smtp-transport.c:791
+# camel/providers/smtp/camel-smtp-transport.c:904
+# camel/providers/smtp/camel-smtp-transport.c:916
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH 请求超时： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1110
 # camel/providers/smtp/camel-smtp-transport.c:1250
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 msgid "QUIT response error"
 msgstr "QUIT 应答错误"
 
 # composer/e-msg-composer-attachment-bar.c:101
 # composer/e-msg-composer-attachment-bar.c:101
 # composer/e-msg-composer-attachment-bar.c:101
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 字节"
 
 # composer/e-msg-composer-attachment-bar.c:103
 # composer/e-msg-composer-attachment-bar.c:103
 # composer/e-msg-composer-attachment-bar.c:103
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u 字节"
@@ -16980,7 +17305,7 @@ msgstr "%u 字节"
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
 # composer/e-msg-composer-attachment-bar.c:110
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
@@ -16988,7 +17313,7 @@ msgstr "%.1fK"
 # composer/e-msg-composer-attachment-bar.c:114
 # composer/e-msg-composer-attachment-bar.c:114
 # composer/e-msg-composer-attachment-bar.c:114
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
@@ -16996,7 +17321,7 @@ msgstr "%.1fM"
 # composer/e-msg-composer-attachment-bar.c:118
 # composer/e-msg-composer-attachment-bar.c:118
 # composer/e-msg-composer-attachment-bar.c:118
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
@@ -17005,28 +17330,28 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:136
 # composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:135
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "附件"
 
 # composer/e-msg-composer-attachment-bar.c:500
 # composer/e-msg-composer-attachment-bar.c:506
 # composer/e-msg-composer-attachment-bar.c:506
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "从附件列表中删除选定的条目"
 
 # composer/e-msg-composer-attachment-bar.c:531
 # composer/e-msg-composer-attachment-bar.c:537
 # composer/e-msg-composer-attachment-bar.c:537
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "添加附件..."
 
 # composer/e-msg-composer-attachment-bar.c:532
 # composer/e-msg-composer-attachment-bar.c:538
 # composer/e-msg-composer-attachment-bar.c:538
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -17036,8 +17361,8 @@ msgstr "把文件附件到邮件"
 # composer/e-msg-composer-attachment.c:184
 # composer/e-msg-composer-attachment.c:168
 # composer/e-msg-composer-attachment.c:184
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "无法附加文件 %s： %s"
@@ -17045,7 +17370,7 @@ msgstr "无法附加文件 %s： %s"
 # composer/e-msg-composer-attachment.c:176
 # composer/e-msg-composer-attachment.c:176
 # composer/e-msg-composer-attachment.c:176
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "无法附加文件 %s：不是普通文件"
@@ -17078,98 +17403,113 @@ msgstr "MIME 类型："
 # composer/e-msg-composer-attachment.glade.h:5
 # composer/e-msg-composer-select-file.c:180
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:327
 # composer/e-msg-composer-hdrs.c:326
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "点击此处以使用地址簿"
 
-# composer/e-msg-composer-hdrs.c:358
-# composer/e-msg-composer-hdrs.c:358
-# composer/e-msg-composer-hdrs.c:356
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "发件人："
-
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:362
 #.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "回复到："
 
+# composer/e-msg-composer-hdrs.c:358
+# composer/e-msg-composer-hdrs.c:358
+# composer/e-msg-composer-hdrs.c:356
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "发件人："
+
 # composer/e-msg-composer-hdrs.c:375
 # composer/e-msg-composer-hdrs.c:375
 # composer/e-msg-composer-hdrs.c:373
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "主题："
 
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:389
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "收信人："
 
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:390
 # composer/e-msg-composer-hdrs.c:388
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "输入邮件的收件人"
 
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:393
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "抄送："
 
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:394
 # composer/e-msg-composer-hdrs.c:392
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该邮件副本的收件人地址"
 
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:397
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "暗中抄送："
 
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:398
 # composer/e-msg-composer-hdrs.c:396
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "输入将接收该邮件副本，但不出现在收件人列表中的收件人地址。"
 
+# addressbook/gui/component/addressbook-config.glade.h:27
+# addressbook/gui/component/addressbook-config.glade.h:27
+# my-evolution/Locations.h:1783
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "波尔图"
+
 # composer/e-msg-composer-select-file.c:228
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:290
 # ui/evolution-message-composer.xml.h:2
 # composer/e-msg-composer-select-file.c:291
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附件一个文件"
@@ -17177,7 +17517,7 @@ msgstr "附件一个文件"
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
 # mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "无法创建 PGP 签名上下文。"
@@ -17185,7 +17525,7 @@ msgstr "无法创建 PGP 签名上下文。"
 # composer/e-msg-composer.c:743
 # composer/e-msg-composer.c:747
 # composer/e-msg-composer.c:695
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -17197,21 +17537,21 @@ msgstr ""
 # composer/e-msg-composer.c:952
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:921
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "警告！"
 
 # composer/e-msg-composer.c:956
 # composer/e-msg-composer.c:960
 # composer/e-msg-composer.c:925
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "文件存在，覆盖它？"
 
 # composer/e-msg-composer.c:978
 # composer/e-msg-composer.c:982
 # composer/e-msg-composer.c:947
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "保存文件错误： %s"
@@ -17219,7 +17559,7 @@ msgstr "保存文件错误： %s"
 # composer/e-msg-composer.c:997
 # composer/e-msg-composer.c:1001
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "读入文件错误： %s"
@@ -17227,7 +17567,7 @@ msgstr "读入文件错误： %s"
 # composer/e-msg-composer.c:1118
 # composer/e-msg-composer.c:1032
 # composer/e-msg-composer.c:997
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "访问文件错误： %s"
@@ -17235,14 +17575,14 @@ msgstr "访问文件错误： %s"
 # composer/e-msg-composer.c:1126
 # composer/e-msg-composer.c:1040
 # composer/e-msg-composer.c:1005
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器检索邮件"
 
 # composer/e-msg-composer.c:1133
 # composer/e-msg-composer.c:1047
 # composer/e-msg-composer.c:1012
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -17254,7 +17594,7 @@ msgstr ""
 # composer/e-msg-composer.c:1140
 # composer/e-msg-composer.c:1054
 # composer/e-msg-composer.c:1019
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -17266,7 +17606,7 @@ msgstr ""
 # composer/e-msg-composer.c:1149
 # composer/e-msg-composer.c:1063
 # composer/e-msg-composer.c:1028
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -17278,7 +17618,7 @@ msgstr ""
 # composer/e-msg-composer.c:1251
 # composer/e-msg-composer.c:1165
 # composer/e-msg-composer.c:1130
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -17289,7 +17629,7 @@ msgstr ""
 # composer/e-msg-composer.c:1405
 # composer/e-msg-composer.c:1322
 # composer/e-msg-composer.c:1288
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -17302,25 +17642,18 @@ msgstr ""
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "警告： 已改动的邮件"
 
 # composer/e-msg-composer.c:1435
 # composer/e-msg-composer.c:1352
 # composer/e-msg-composer.c:1318
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "打开文件"
 
-# composer/e-msg-composer.c:1584
-# composer/e-msg-composer.c:1501
-# composer/e-msg-composer.c:1467
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "插入文件"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
@@ -17329,19 +17662,19 @@ msgstr ""
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "签名文件："
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
 # mail/mail-accounts.c:149
 # mail/mail-accounts.c:149
 # mail/mail-accounts.c:149
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "(默认)"
@@ -17349,14 +17682,14 @@ msgstr "(默认)"
 # composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
 # composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
 # composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "撰写邮件"
 
 # composer/e-msg-composer.c:2440
 # composer/e-msg-composer.c:2380
 # composer/e-msg-composer.c:2351
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -17367,7 +17700,7 @@ msgstr ""
 # composer/e-msg-composer.c:2463 composer/e-msg-composer.c:2518
 # composer/e-msg-composer.c:2403 composer/e-msg-composer.c:2458
 # composer/e-msg-composer.c:2374 composer/e-msg-composer.c:2429
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -17375,9 +17708,9 @@ msgstr ""
 "无法创见撰写窗口：\n"
 "无法激活 HTML 编辑器组件。"
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -17489,8 +17822,8 @@ msgstr "主题不含有"
 # mail/mail-display.c:106
 # calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2070
 # mail/mail-display.c:105
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -17501,15 +17834,14 @@ msgstr ""
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "记住该密码"
 
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:268
 # e-util/e-passwords.c:362 mail/mail-session.c:270
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码"
 
@@ -17664,129 +17996,85 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "年"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "年"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "秒"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "月"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "分钟"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "月"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "小时"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "周"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "周"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "小时"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "月"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "分钟"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "月"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "秒"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "年"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "年"
+
+#: filter/filter-datespec.c:174
 msgid "You have forgotten to choose a date."
 msgstr "您忘记选择日期了。"
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
-msgstr "您选择了无效的日期。"
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"邮件的日期将与过滤规则运行的\n"
-"日期或者虚拟文件夹打开的\n"
-"日期进行比较。"
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"邮件的日期将与您在这里\n"
-"指定的日期进行比较。"
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"邮件的日期将于相对于过滤规则\n"
-"运行的时间进行比较；\n"
-"例如：“一周以前”。"
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "当前时间"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "您指定的时间"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr "选择用于比较的时间"
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "比较"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<点击这里以选择日期>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "现在"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr " 过去"
-
-#: filter/filter-datespec.c:621
-msgid "ago"
-msgstr "过去"
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+# calendar/gui/calendar-commands.c:451 calendar/gui/calendar-commands.c:456
+# calendar/gui/calendar-commands.c:458
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%Y %b %d %a"
 
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
+msgstr " 过去"
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<点击这里以选择日期>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr "选择用于比较的时间"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "过滤规则"
 
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 #, fuzzy
 msgid "You must specify a file name"
 msgstr "指定文件名："
@@ -17794,7 +18082,7 @@ msgstr "指定文件名："
 # camel/providers/local/camel-spool-store.c:115
 # camel/providers/local/camel-spool-store.c:115
 # camel/providers/local/camel-spool-store.c:115
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "脱机文件“%s”不存在或不是普通文件"
@@ -17802,21 +18090,21 @@ msgstr "脱机文件“%s”不存在或不是普通文件"
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "打开文件"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "则"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "添加动作"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 msgid ""
 "You forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
@@ -17827,12 +18115,12 @@ msgstr ""
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -17841,91 +18129,175 @@ msgstr ""
 "常规表达式错误 “%s”：\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
-msgstr ""
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "重要"
+
+# my-evolution/Locations.h:508
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "科克"
+
+# my-evolution/Locations.h:1795
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#, fuzzy
+msgid "Personal"
+msgstr "波纳尔"
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/fulladdr.glade.h:209
+# addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "多哥"
+
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
+# calendar/gui/dialogs/alarm-page.glade.h:11
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "之后"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "测试"
 
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 msgid "You must name this filter."
 msgstr "您必须为该过滤规则命名。"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "规则名："
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "无标题"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "如果"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "执行动作"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "如果满足所有条件"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "如果满足任一条件"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "添加条件"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "接收"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "发送"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "比较"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "编辑过滤规则"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "编辑虚拟文件夹"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "接收"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "发送"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"邮件的日期将与您在这里\n"
+"指定的日期进行比较。"
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"邮件的日期将于相对于过滤规则\n"
+"运行的时间进行比较；\n"
+"例如：“一周以前”。"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"邮件的日期将与您在这里\n"
+"指定的日期进行比较。"
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "虚拟文件夹"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "过去"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "仅指定文件夹"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "当前时间"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "虚拟文件夹来源"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "以全部活跃远程文件夹"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "以全部本地和活跃远程文件夹"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "以所有本地文件夹"
 
@@ -17955,49 +18327,43 @@ msgstr "附件"
 msgid "Beep"
 msgstr "伯利兹"
 
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
-# addressbook/backend/ebook/e-card-simple.c:67
-# addressbook/gui/contact-editor/e-contact-editor.c:1650
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "公司"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "含有"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "接收日期"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "发送日期"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "已删除"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "不含有"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "不以之结尾"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "不存在"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "不存在"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "听起来不像"
@@ -18019,66 +18385,57 @@ msgid "ends with"
 msgstr "以之结束"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr "执行 Shell 命令"
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "存在"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "表达式"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "重要"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "是"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is after"
 msgstr "以后"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 msgid "is before"
 msgstr "以前"
 
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "已标志"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "大于"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "小于"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "不是"
 
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
 # mail/message-list.etspec.h:2
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "已标志"
@@ -18086,27 +18443,32 @@ msgstr "已标志"
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # my-evolution/Locations.h:1192
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 #, fuzzy
 msgid "Label"
 msgstr "劳雷尔"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "邮件体"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "邮件头"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "移动到文件夹"
 
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "执行 Shell 命令"
+
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
 # calendar/gui/dialogs/alarm-options.glade.h:3
@@ -18115,7 +18477,7 @@ msgstr "移动到文件夹"
 msgid "Play Sound"
 msgstr "播放声音："
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "已读"
 
@@ -18131,63 +18493,98 @@ msgstr "常规表达式匹配"
 msgid "Replied to"
 msgstr "已回复"
 
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# addressbook/backend/ebook/e-card-simple.c:65
+# addressbook/backend/ebook/e-card-simple.c:70
+# my-evolution/Locations.h:327
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "伯恩斯"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "大于"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "小于"
+
 # mail/message-list.etspec.h:5
 # mail/message-list.etspec.h:6
 # mail/message-list.etspec.h:6
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "分数"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "发件人"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "设置状态"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "执行 Shell 命令"
+
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "听起来象"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "指定邮件头"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "以之开始"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "停止处理"
 
 # mail/message-list.etspec.h:9
 # mail/message-list.etspec.h:10
 # mail/message-list.etspec.h:10
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "主题"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "设置状态"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "规则"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "编辑规则"
 
@@ -18195,11 +18592,11 @@ msgstr "编辑规则"
 msgid "Score Rules"
 msgstr "计分规则"
 
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 msgid "You must name this vfolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 msgid "You need to to specify at least one folder as a source."
 msgstr "您至少需要把一个文件夹指定为源。"
 
@@ -18216,7 +18613,7 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 # importers/pine-importer.c:101
 # importers/elm-importer.c:96 importers/netscape-importer.c:107
 # importers/pine-importer.c:101
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "正在导入..."
@@ -18227,7 +18624,7 @@ msgstr "正在导入..."
 # importers/pine-importer.c:103
 # importers/elm-importer.c:98 importers/netscape-importer.c:109
 # importers/pine-importer.c:103
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "请等待"
@@ -18238,7 +18635,7 @@ msgstr "请等待"
 # importers/pine-importer.c:365
 # importers/elm-importer.c:169 importers/netscape-importer.c:689
 # importers/pine-importer.c:365
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
@@ -18250,7 +18647,7 @@ msgstr "正在按 %2$s 导入 %1$s"
 # importers/pine-importer.c:471
 # importers/elm-importer.c:375 importers/netscape-importer.c:782
 # importers/pine-importer.c:471
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
@@ -18262,9 +18659,9 @@ msgstr "正在扫描 %s"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "邮件"
 
@@ -18340,7 +18737,7 @@ msgstr ""
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
 # importers/netscape-importer.c:106
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
@@ -18348,15 +18745,15 @@ msgstr "Evolution 正在导入您原来的 Netscape 数据"
 # mail/mail-ops.c:1060 shell/e-local-storage.c:178
 # mail/mail-ops.c:1103 shell/e-local-storage.c:178
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "已删除"
 
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
 # camel/providers/local/camel-local-store.c:196
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "本地邮件文件 %s"
@@ -18364,25 +18761,25 @@ msgstr "本地邮件文件 %s"
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
 # importers/netscape-importer.c:888 importers/pine-importer.c:570
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "正在扫描目录"
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "开始导入"
 
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
 # importers/netscape-importer.c:963
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "设置"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "编辑过滤规则"
@@ -18390,7 +18787,7 @@ msgstr "编辑过滤规则"
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
 # importers/netscape-importer.c:984
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -18519,12 +18916,12 @@ msgstr "没有循环(_N)"
 # mail/mail-config.glade.h:8
 # mail/mail-config.glade.h:8
 # mail/mail-config.glade.h:8
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "帐号"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -18596,7 +18993,7 @@ msgstr "改变该文件夹的属性"
 # mail/component-factory.c:783
 # mail/component-factory.c:783
 # mail/component-factory.c:786
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -18605,18 +19002,18 @@ msgstr "您的某些邮件设置好像已崩溃，请按顺序检查所有内容
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:230
 # mail/mail-callbacks.c:187
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "您还没有设置邮件传输方法"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
 # composer/e-msg-composer.c:1412
 # composer/e-msg-composer.c:1329
 # composer/e-msg-composer.c:1295
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "警告： 已改动的邮件"
@@ -18624,42 +19021,74 @@ msgstr "警告： 已改动的邮件"
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "新建邮件"
 
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
 # ui/evolution-mail-global.xml.h:20
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
+# composer/e-msg-composer.c:1970 composer/e-msg-composer.c:2423
+# composer/e-msg-composer.c:1887 composer/e-msg-composer.c:2363
+# composer/e-msg-composer.c:1853 composer/e-msg-composer.c:2334
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "撰写邮件"
+
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "新建邮件"
+
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+# ui/evolution-mail-message.xml.h:65
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "上一个邮件"
+
+# mail/component-factory.c:951
+# mail/component-factory.c:951
+# mail/component-factory.c:955
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "新建邮件"
+
 # mail/component-factory.c:975
 # mail/component-factory.c:975
 # mail/component-factory.c:980
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "无法初始化 Evolution 的邮件组件。"
 
 # mail/component-factory.c:984
 # mail/component-factory.c:984
 # mail/component-factory.c:989
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "无法初始化 Evolution 的邮件配置组件。"
 
 # mail/component-factory.c:990
 # mail/component-factory.c:990
 # mail/component-factory.c:995
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "无法初始化 Evolution 的文件夹信息组件。"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "正在连接服务器..."
@@ -18667,14 +19096,14 @@ msgstr "正在连接服务器..."
 # mail/component-factory.c:1206
 # mail/component-factory.c:1206
 # mail/component-factory.c:1211
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "无法用 shell 注册存储"
 
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:272
 # mail/folder-browser-ui.c:273
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "“%s”的属性"
@@ -18682,14 +19111,14 @@ msgstr "“%s”的属性"
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:274
 # mail/folder-browser-ui.c:275
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "属性"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "无法创建临时目录： %s"
@@ -18770,102 +19199,102 @@ msgstr "从邮件创建虚拟文件夹(_V)"
 # mail/folder-browser.c:1430
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1438
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "关于主题的虚拟文件夹(_S)"
 
 # mail/folder-browser.c:1431
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1439
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "关于发件人的虚拟文件夹(_N)"
 
 # mail/folder-browser.c:1432
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1440
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "关于收件人的虚拟文件夹(_R)"
 
 # mail/folder-browser.c:1433
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1441
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "关于邮件列表的虚拟文件夹(_L)"
 
 # mail/folder-browser.c:1437
 # mail/folder-browser.c:1444
 # mail/folder-browser.c:1445
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "过滤标题(_J)"
 
 # mail/folder-browser.c:1438
 # mail/folder-browser.c:1445
 # mail/folder-browser.c:1446
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "过滤发件人(_D)"
 
 # mail/folder-browser.c:1439
 # mail/folder-browser.c:1446
 # mail/folder-browser.c:1447
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "过滤收件人(_C)"
 
 # mail/folder-browser.c:1440
 # mail/folder-browser.c:1447
 # mail/folder-browser.c:1448
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "过滤邮件列表(_M)"
 
 # mail/folder-browser.c:1448 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:96
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:98
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
 # mail/folder-browser.c:1450
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1458
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "打印(_P)"
 
 # mail/folder-browser.c:1454 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1461 ui/evolution-mail-message.xml.h:104
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:106
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
 # mail/folder-browser.c:1455 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1462 ui/evolution-mail-message.xml.h:73
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:75
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
 # mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1463 ui/evolution-mail-message.xml.h:72
 # mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:74
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
 # mail/folder-browser.c:1457
 # mail/folder-browser.c:1464
 # mail/folder-browser.c:1465
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -18881,7 +19310,7 @@ msgstr ""
 # calendar/gui/dialogs/task-details-page.glade.h:4
 # calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:329
 # calendar/gui/e-meeting-model.c:352 calendar/gui/print.c:2252
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "已完成"
@@ -18890,7 +19319,7 @@ msgstr "已完成"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "清除"
@@ -18899,14 +19328,14 @@ msgstr "清除"
 # mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:43
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:43
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
 # mail/folder-browser.c:1460 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1467 ui/evolution-mail-message.xml.h:45
 # mail/folder-browser.c:1468 ui/evolution-mail-message.xml.h:45
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "标记为未读(_N)"
@@ -18914,14 +19343,14 @@ msgstr "标记为未读(_N)"
 # mail/folder-browser.c:1461
 # mail/folder-browser.c:1468
 # mail/folder-browser.c:1469
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
 # ui/evolution-mail-message.xml.h:46
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_O)"
@@ -18929,7 +19358,7 @@ msgstr "标记为不重要(_O)"
 # mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "反删除(_U)"
@@ -18937,7 +19366,7 @@ msgstr "反删除(_U)"
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_M)..."
@@ -18945,14 +19374,14 @@ msgstr "移动到文件夹(_M)..."
 # mail/folder-browser.c:1467
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1477
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹..."
 
 # mail/folder-browser.c:1473 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1482 ui/evolution-mail-message.xml.h:1
 # mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:1
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿"
@@ -18960,7 +19389,7 @@ msgstr "将发件人添加到地址簿"
 # mail/folder-browser.c:1476
 # mail/folder-browser.c:1485
 # mail/folder-browser.c:1486
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "应用过滤规则"
@@ -18968,7 +19397,7 @@ msgstr "应用过滤规则"
 # mail/folder-browser.c:1478
 # mail/folder-browser.c:1487
 # mail/folder-browser.c:1488
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "从消息创建规则(_L)"
@@ -18976,7 +19405,7 @@ msgstr "从消息创建规则(_L)"
 # mail/folder-browser.c:1629
 # mail/folder-browser.c:1657
 # mail/folder-browser.c:1658
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "关于邮件列表的虚拟文件夹"
@@ -18984,7 +19413,7 @@ msgstr "关于邮件列表的虚拟文件夹"
 # mail/folder-browser.c:1631
 # mail/folder-browser.c:1659
 # mail/folder-browser.c:1660
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "过滤邮件列表 (%s)"
@@ -18992,7 +19421,7 @@ msgstr "过滤邮件列表 (%s)"
 # mail/folder-browser.c:1632
 # mail/folder-browser.c:1660
 # mail/folder-browser.c:1661
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "关于邮件列表 (%s) 的虚拟文件夹"
@@ -19098,18 +19527,10 @@ msgstr "mh"
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 # mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "您还没有填写所有必须的信息。"
 
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-# mail/mail-account-editor-news.c:160
-#. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution 新闻编辑器"
-
 # mail/mail-account-editor.c:160
 # mail/mail-account-editor.c:160
 # mail/mail-account-editor.c:160
@@ -19121,14 +19542,14 @@ msgstr "Evolution 帐号编辑器"
 # mail/mail-config.glade.h:104
 # mail/mail-config.glade.h:104
 # mail/mail-config.glade.h:113
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "主机(_H)："
 
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:117
 # mail/mail-config.glade.h:126
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "用户名(_U)："
@@ -19136,42 +19557,42 @@ msgstr "用户名(_U)："
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:112
 # mail/mail-config.glade.h:121
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "路径(_P)："
 
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1654
 # mail/mail-account-gui.c:1665
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "您不能以相同的名字创建两个帐号。"
 
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
 # mail/mail-accounts.c:293
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "您确信您要删除该帐号？"
 
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
 # mail/mail-accounts.c:297
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "不要删除"
 
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
 # mail/mail-accounts.c:300
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "确实删除帐号？"
 
 # mail/mail-accounts.c:194
 # mail/mail-accounts.c:194
 # mail/mail-accounts.c:194
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
@@ -19180,23 +19601,16 @@ msgstr "禁用"
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "启用"
 
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-# mail/mail-accounts.c:532 mail/mail-accounts.c:536
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "您确信您要删除该邮件帐号？"
-
 # mail/mail-config.glade.h:33
 # mail/mail-config.glade.h:33
 # mail/mail-config.glade.h:39
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "已启用"
@@ -19204,7 +19618,7 @@ msgstr "已启用"
 # addressbook/gui/component/addressbook-config.glade.h:23
 # addressbook/gui/component/addressbook-config.glade.h:23
 # addressbook/gui/component/addressbook-config.glade.h:30
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "帐号名(_A)："
@@ -19213,7 +19627,7 @@ msgstr "帐号名(_A)："
 # addressbook/gui/contact-editor/fulladdr.glade.h:171
 # addressbook/gui/contact-editor/e-contact-editor-address.c:298
 # my-evolution/Locations.h:1824
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "波多黎各"
@@ -19229,7 +19643,7 @@ msgstr "邮寄给 %s"
 # mail/mail-autofilter.c:215
 # mail/mail-autofilter.c:217
 # mail/mail-autofilter.c:217
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
@@ -19237,7 +19651,7 @@ msgstr "主题是 %s"
 # mail/mail-autofilter.c:231
 # mail/mail-autofilter.c:233
 # mail/mail-autofilter.c:233
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "邮件来自 %s"
@@ -19245,7 +19659,7 @@ msgstr "邮件来自 %s"
 # mail/mail-autofilter.c:287
 # mail/mail-autofilter.c:289
 # mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
@@ -19253,15 +19667,15 @@ msgstr "%s 邮件列表"
 # mail/mail-autofilter.c:336 mail/mail-autofilter.c:356
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
 # mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -19272,7 +19686,7 @@ msgstr ""
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:137
 # mail/mail-callbacks.c:94
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -19287,7 +19701,7 @@ msgstr ""
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:186
 # mail/mail-callbacks.c:143
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -19298,7 +19712,7 @@ msgstr ""
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:200
 # mail/mail-callbacks.c:157
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -19310,7 +19724,7 @@ msgstr ""
 # mail/mail-callbacks.c:265
 # mail/mail-callbacks.c:222
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -19319,14 +19733,14 @@ msgstr "您正在发送 HTML 格式的消息，当以下收件人不希望接收
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:280
 # mail/mail-callbacks.c:237
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 msgid "Send anyway?"
 msgstr "仍然发送？"
 
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:322
 # mail/mail-callbacks.c:279
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -19337,7 +19751,7 @@ msgstr ""
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:366
 # mail/mail-callbacks.c:323
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -19348,14 +19762,14 @@ msgstr ""
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:370
 # mail/mail-callbacks.c:327
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "该邮件只含有密件抄送收件人。"
 
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:374
 # mail/mail-callbacks.c:331
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -19367,21 +19781,14 @@ msgstr ""
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:504
 # mail/mail-callbacks.c:460
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "您必须指定收件人以便发送该消息。"
 
-# mail/mail-callbacks.c:600
-# mail/mail-callbacks.c:600
-# mail/mail-callbacks.c:549
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
-
 # composer/e-msg-composer.c:1068
 # mail/mail-callbacks.c:716
 # mail/mail-callbacks.c:668
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -19392,35 +19799,35 @@ msgstr ""
 # mail/mail-callbacks.c:838
 # mail/mail-callbacks.c:928
 # mail/mail-callbacks.c:878
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 # mail/mail-callbacks.c:843
 # mail/mail-callbacks.c:933
 # mail/mail-callbacks.c:883
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "在 %Y-%m-%d %a 的 %H:%M， %%s 写道："
 
 # mail/mail-callbacks.c:1281 mail/message-browser.c:130
 # mail/mail-callbacks.c:1376 mail/message-browser.c:130
 # mail/mail-callbacks.c:1411 mail/message-browser.c:130
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "将消息移动到"
 
 # mail/mail-callbacks.c:1283 mail/message-browser.c:132
 # mail/mail-callbacks.c:1378 mail/message-browser.c:132
 # mail/mail-callbacks.c:1413 mail/message-browser.c:132
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "将消息复制到"
 
 # mail/mail-callbacks.c:1759
 # mail/mail-callbacks.c:1878
 # mail/mail-callbacks.c:1914
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "您确信您需要编辑所有的 %d 个消息？"
@@ -19428,7 +19835,7 @@ msgstr "您确信您需要编辑所有的 %d 个消息？"
 # mail/mail-callbacks.c:1784
 # mail/mail-callbacks.c:1903
 # mail/mail-callbacks.c:1939
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -19439,7 +19846,7 @@ msgstr ""
 # mail/mail-callbacks.c:1823
 # mail/mail-callbacks.c:1942
 # mail/mail-callbacks.c:1978
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -19450,7 +19857,7 @@ msgstr ""
 # mail/mail-callbacks.c:1837
 # mail/mail-callbacks.c:1956
 # mail/mail-callbacks.c:1992
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "您确信您希望重新发送所有的 %d 个消息？"
@@ -19458,7 +19865,7 @@ msgstr "您确信您希望重新发送所有的 %d 个消息？"
 # mail/mail-callbacks.c:1863
 # mail/mail-callbacks.c:1982
 # mail/mail-callbacks.c:2018
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "没有选择消息"
 
@@ -19468,33 +19875,33 @@ msgstr "没有选择消息"
 # mail/mail-display.c:102
 # calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2063
 # mail/mail-display.c:101
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "覆盖文件？"
 
 # mail/mail-callbacks.c:1962
 # mail/mail-callbacks.c:2081
 # mail/mail-callbacks.c:2117
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "消息另存为..."
 
 # mail/mail-callbacks.c:1964
 # mail/mail-callbacks.c:2083
 # mail/mail-callbacks.c:2119
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "消息另存为..."
 
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
 # ui/evolution-mail-message.xml.h:21
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "显示下一个未读文件"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
@@ -19503,7 +19910,7 @@ msgstr ""
 # mail/mail-callbacks.c:2135
 # mail/mail-callbacks.c:2254
 # mail/mail-callbacks.c:2290
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -19518,7 +19925,7 @@ msgstr ""
 # mail/mail-callbacks.c:2250
 # mail/mail-callbacks.c:2369
 # mail/mail-callbacks.c:2405
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -19530,14 +19937,14 @@ msgstr ""
 # mail/mail-callbacks.c:2262
 # mail/mail-callbacks.c:2381
 # mail/mail-callbacks.c:2417
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "过滤规则"
 
 # camel/camel-filter-driver.c:789
 # camel/camel-filter-driver.c:838
 # mail/mail-callbacks.c:2490
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
@@ -19545,27 +19952,27 @@ msgstr "第 %d 页，共 %d 页"
 # mail/mail-callbacks.c:2325
 # mail/mail-callbacks.c:2465
 # mail/mail-callbacks.c:2542
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "打印消息"
 
 # mail/mail-callbacks.c:2492
 # mail/mail-callbacks.c:2569
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr "美国信纸"
 
 # mail/mail-callbacks.c:2371
 # mail/mail-callbacks.c:2531
 # mail/mail-callbacks.c:2604
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "打印消息失败"
 
 # mail/mail-callbacks.c:2473
 # mail/mail-callbacks.c:2697
 # mail/mail-callbacks.c:2770
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "您确信您希望在单独的窗口中打开所有的 %d 个消息？"
@@ -19592,7 +19999,7 @@ msgstr ""
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
 # addressbook/gui/component/select-names/e-select-names-popup.c:506
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "未命名的联系人"
@@ -19622,10 +20029,11 @@ msgstr "保存签名"
 # mail/mail-config-druid.c:146
 # mail/mail-config-druid.c:146
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "请在下面输入您的名字和电子邮件地址。“可选”域可以不填写，\n"
 "除非您希望在您发送的邮件中含有这些信息。"
@@ -19634,10 +20042,10 @@ msgstr ""
 # mail/mail-config-druid.c:148
 # mail/mail-config-druid.c:148
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "请在下面输入您的接收邮件服务器的信息。如果您不能确定，\n"
 "请询问您的系统管理员或互联网服务提供商。"
@@ -19653,10 +20061,10 @@ msgstr "请从以下选项中选择"
 # mail/mail-config-druid.c:152
 # mail/mail-config-druid.c:152
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "请输入您发送邮件的方式的信息。如果您不能确定，\n"
 "请询问您的系统管理员或互联网服务提供商。"
@@ -19665,14 +20073,13 @@ msgstr ""
 # mail/mail-config-druid.c:154
 # mail/mail-config-druid.c:154
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "您基本上完成了邮件配置过程。身份标识、邮件接收服务器和您提供\n"
 "的邮件发送传输方法将组合起来构成 Evolution 邮件帐号。\n"
@@ -19683,46 +20090,14 @@ msgstr ""
 # mail/mail-config-druid.c:599
 # mail/mail-config-druid.c:599
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-# my-evolution/Locations.h:508
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "科克"
-
-# my-evolution/Locations.h:1795
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-#, fuzzy
-msgid "Personal"
-msgstr "波纳尔"
-
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/fulladdr.glade.h:209
-# addressbook/gui/contact-editor/e-contact-editor-address.c:335
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "多哥"
-
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:34
-# calendar/gui/dialogs/alarm-page.glade.h:11
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "之后"
-
 # mail/mail-config.c:326
 # mail/mail-config.c:329
 # mail/mail-config.c:354
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, c-format
 msgid "Account %d"
 msgstr "帐号 %d"
@@ -19730,14 +20105,14 @@ msgstr "帐号 %d"
 # mail/mail-config.c:2113
 # mail/mail-config.c:2155
 # mail/mail-config.c:2248
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "正在检查服务"
 
 # mail/mail-config.c:2184 mail/mail-config.c:2188
 # mail/mail-config.c:2233 mail/mail-config.c:2237
 # mail/mail-config.c:2326 mail/mail-config.c:2330
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "正在连接服务器..."
 
@@ -20146,21 +20521,21 @@ msgstr "装入图像(_I)"
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:48
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:43
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "邮件"
@@ -20168,7 +20543,7 @@ msgstr "邮件"
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:101
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "邮件显示(_M)"
@@ -20176,48 +20551,33 @@ msgstr "邮件显示(_M)"
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/fulladdr.glade.h:138
 # addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "密克罗尼西亚"
 
-# mail/mail-config.glade.h:45
-# mail/mail-config.glade.h:45
-# mail/mail-config.glade.h:52
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP 服务器："
-
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:41
 # mail/mail-config.glade.h:53
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 msgid "New Mail Notification"
 msgstr "新邮件提醒"
 
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-# my-evolution/my-evolution.glade.h:28
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "新闻来源(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:48
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "可选的信息"
 
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
 # addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "组织(_Z)："
@@ -20225,21 +20585,21 @@ msgstr "组织(_Z)："
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:50
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:53
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "选取一个颜色"
 
 # mail/mail-config.glade.h:57
 # mail/mail-config.glade.h:57
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "在发送只给出了暗送收件人时进行提示(_B)"
@@ -20247,14 +20607,14 @@ msgstr "在发送只给出了暗送收件人时进行提示(_B)"
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:54
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "打印选中的联系人"
@@ -20262,14 +20622,14 @@ msgstr "打印选中的联系人"
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:58
 # mail/mail-config.glade.h:67
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail 邮件目录"
 
 # camel/camel-filter-driver.c:692
 # camel/camel-filter-driver.c:741
 # camel/camel-filter-driver.c:893
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "无法打开消息"
@@ -20277,21 +20637,21 @@ msgstr "无法打开消息"
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:68
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "已引用"
 
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:60
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 msgid "Re_member this password"
 msgstr "记住该密码(_M)"
 
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:364
 # composer/e-msg-composer-hdrs.c:362
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "回复到："
@@ -20299,14 +20659,14 @@ msgstr "回复到："
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:6
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "正在接收电子邮件"
 
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:63
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "接收中选项"
@@ -20314,7 +20674,7 @@ msgstr "接收中选项"
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:267
 # e-util/e-passwords.c:360 mail/mail-session.c:269
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "记住该密码"
@@ -20322,14 +20682,22 @@ msgstr "记住该密码"
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:64
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "必需的信息"
 
+# mail/mail-config.glade.h:23
+# mail/folder-browser.h:26
+# mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "默认"
+
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:67
 # mail/mail-config.glade.h:76
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "安全"
@@ -20337,30 +20705,30 @@ msgstr "安全"
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:66
 # mail/mail-config.glade.h:75
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:69
 # mail/mail-config.glade.h:78
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "选择 PGP 二进制数"
@@ -20368,49 +20736,49 @@ msgstr "选择 PGP 二进制数"
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 # mail/mail-config.glade.h:79 shell/glade/evolution-startup-wizard.glade.h:7
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "正在发送电子邮件"
 
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:74
 # mail/mail-config.glade.h:83
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 msgid "Sent _messages folder:"
 msgstr "发送邮件文件夹(_M)："
 
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:75
 # mail/mail-config.glade.h:84
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "已发送和草稿邮件"
 
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:76
 # mail/mail-config.glade.h:85
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:77
 # mail/mail-config.glade.h:86
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "服务器配置"
 
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:78
 # mail/mail-config.glade.h:87
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 msgid "Server _Type: "
 msgstr "服务器类型(_T)："
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "快捷方式"
@@ -20418,7 +20786,7 @@ msgstr "快捷方式"
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "签名文件："
@@ -20426,63 +20794,49 @@ msgstr "签名文件："
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:79
 # mail/mail-config.glade.h:88
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "签名文件："
 
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:80
-# mail/mail-config.glade.h:89
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "来源"
-
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:81
-# mail/mail-config.glade.h:90
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "来源信息"
-
 # addressbook/printing/e-contact-print.glade.h:38
 # addressbook/printing/e-contact-print.glade.h:38
 # mail/mail-config.glade.h:92
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "指定文件名："
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:84
 # mail/mail-config.glade.h:93
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "标准 Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -20491,7 +20845,7 @@ msgstr ""
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "不定风"
@@ -20499,7 +20853,7 @@ msgstr "不定风"
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:87
 # mail/mail-config.glade.h:96
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -20512,7 +20866,7 @@ msgstr ""
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
 # my-evolution/metar.c:65
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "东"
@@ -20520,7 +20874,7 @@ msgstr "东"
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "签名文件(_S)："
@@ -20528,48 +20882,48 @@ msgstr "签名文件(_S)："
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:91
 # mail/mail-config.glade.h:100
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "总是离线装入图像(_A)"
 
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:92
 # mail/mail-config.glade.h:101
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 msgid "_Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名邮件(_A)"
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 msgid "_Authentication Type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:93
 # mail/mail-config.glade.h:102
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 msgid "_Authentication type: "
 msgstr "验证类型(_A)："
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 msgid "_Automatically check for new mail"
 msgstr "自动检查新邮件(_A)"
 
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:94
 # mail/mail-config.glade.h:103
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "自动检查新邮件(_A)"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Beep when new mail arrives"
 msgstr "新邮件到达时鸣笛"
@@ -20577,14 +20931,14 @@ msgstr "新邮件到达时鸣笛"
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:95
 # mail/mail-config.glade.h:104
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 msgid "_Certificate ID:"
 msgstr "证书 ID(_C)："
 
 # mail/mail-config.glade.h:16
 # mail/mail-config.glade.h:16
 # mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "当删除文件夹时进行提示"
@@ -20592,7 +20946,7 @@ msgstr "当删除文件夹时进行提示"
 # ui/evolution-message-composer.xml.h:5
 # ui/evolution-message-composer.xml.h:5
 # ui/evolution-message-composer.xml.h:5
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "删除签名以外的所有内容"
@@ -20600,13 +20954,13 @@ msgstr "删除签名以外的所有内容"
 # mail/mail-config.glade.h:23
 # mail/folder-browser.h:26
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "默认"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "新邮件到达时不要提醒我"
@@ -20614,19 +20968,19 @@ msgstr "新邮件到达时不要提醒我"
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
 # mail/mail-accounts.c:196
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "启用"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
 # ui/evolution-mail-message.xml.h:32
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "转发方式"
@@ -20634,14 +20988,14 @@ msgstr "转发方式"
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:101
 # mail/mail-config.glade.h:110
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 msgid "_Full name:"
 msgstr "全名(_F)："
 
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:38
 # mail/mail-config.glade.h:45
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "在 HTML 邮件中"
@@ -20649,7 +21003,7 @@ msgstr "在 HTML 邮件中"
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 # mail/mail-config.glade.h:44 shell/glade/evolution-startup-wizard.glade.h:4
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "标识"
@@ -20657,14 +21011,14 @@ msgstr "标识"
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:105
 # mail/mail-config.glade.h:114
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
 
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:44
 # mail/mail-config.glade.h:51
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "设置为我的默认帐号(_D)"
@@ -20672,7 +21026,7 @@ msgstr "设置为我的默认帐号(_D)"
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:107
 # mail/mail-config.glade.h:116
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "阅读时将邮件标记为已读，延时(_M)"
@@ -20680,26 +21034,26 @@ msgstr "阅读时将邮件标记为已读，延时(_M)"
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:108
 # mail/mail-config.glade.h:117
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "名称(_N)："
 
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:109
 # mail/mail-config.glade.h:118
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "从不装入图像"
 
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:111
 # mail/mail-config.glade.h:120
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "PGP 二进制路径(_P)："
 
 # mail/mail-config.glade.h:62
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Play sound file when new mail arrives"
 msgstr "新邮件到达时播放声音文件"
@@ -20707,7 +21061,7 @@ msgstr "新邮件到达时播放声音文件"
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:55
 # mail/mail-config.glade.h:64
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候进行提示"
@@ -20715,7 +21069,7 @@ msgstr "在往不希望接收 HTML 消息的联系人发送 HTML 消息的时候
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:56
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "在发送空标题的消息时进行提示(_E)"
@@ -20723,7 +21077,7 @@ msgstr "在发送空标题的消息时进行提示(_E)"
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:62
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "正在接收邮件"
@@ -20731,19 +21085,19 @@ msgstr "正在接收邮件"
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:73
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "全部回复"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "安全(_S)"
@@ -20751,14 +21105,14 @@ msgstr "安全(_S)"
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "安全(_S)"
 
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:71
 # mail/mail-config.glade.h:80
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "正在发送邮件"
@@ -20769,7 +21123,7 @@ msgstr "正在发送邮件"
 # calendar/gui/e-calendar-table.etspec.h:13
 # calendar/gui/dialogs/event-page.glade.h:11
 # calendar/gui/e-calendar-table.etspec.h:13
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "按其显示时间"
@@ -20777,7 +21131,7 @@ msgstr "按其显示时间"
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:116
 # mail/mail-config.glade.h:125
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "签名文件(_S)："
@@ -20785,7 +21139,7 @@ msgstr "签名文件(_S)："
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:86
 # mail/mail-config.glade.h:95
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "使用安全连接 (SSL)"
@@ -20793,7 +21147,7 @@ msgstr "使用安全连接 (SSL)"
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
 # my-evolution/metar.c:63
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "不定风"
@@ -20801,14 +21155,14 @@ msgstr "不定风"
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:118
 # mail/mail-config.glade.h:127
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 msgid "_every"
 msgstr "每(_E)"
 
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " 颜色"
@@ -20816,18 +21170,11 @@ msgstr " 颜色"
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:119
 # mail/mail-config.glade.h:128
-#: mail/mail-config.glade.h:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "描述"
 
-# mail/mail-config.glade.h:121
-# mail/mail-config.glade.h:121
-# mail/mail-config.glade.h:130
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "新闻窗口1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -20869,36 +21216,37 @@ msgstr "无法创建 S/MIME 解码上下文。"
 # mail/mail-display.c:243
 # mail/mail-display.c:242
 # mail/mail-display.c:243
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "保存附件"
 
 # mail/folder-browser.c:297 mail/mail-display.c:298
 # mail/folder-browser.c:297 mail/mail-display.c:297
 # mail/folder-browser.c:298 mail/mail-display.c:298
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "无法创建临时目录： %s"
 
-# mail/mail-display.c:350
-# mail/mail-display.c:349
-# mail/mail-display.c:350
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "保存到磁盘..."
+# mail/mail-display.c:243
+# mail/mail-display.c:242
+# mail/mail-display.c:243
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "保存附件"
 
 # mail/mail-display.c:352
 # mail/mail-display.c:351
 # mail/mail-display.c:352
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "嵌入视图"
 
 # mail/mail-display.c:354
 # mail/mail-display.c:353
 # mail/mail-display.c:354
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -20906,7 +21254,7 @@ msgstr "在 %s 中打开..."
 # mail/mail-display.c:415
 # mail/mail-display.c:414
 # mail/mail-display.c:415
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "嵌入视图 (通过 %s)"
@@ -20914,64 +21262,81 @@ msgstr "嵌入视图 (通过 %s)"
 # mail/mail-display.c:419
 # mail/mail-display.c:418
 # mail/mail-display.c:419
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "隐藏"
 
 # mail/mail-display.c:440
 # mail/mail-display.c:439
 # mail/mail-display.c:440
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "外部视图"
 
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+# ui/evolution-mail-message.xml.h:42
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "装入图像(_I)"
+
 # mail/mail-display.c:1133
 # mail/mail-display.c:1136
 # mail/mail-display.c:1162
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "装入邮件内容"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "被延误的任务(_V)："
 
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
 # mail/mail-display.c:1602
 # mail/mail-display.c:1628
 # mail/mail-display.c:1657
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "在浏览器中打开连接"
 
 # mail/mail-display.c:1604
 # mail/mail-display.c:1630
 # mail/mail-display.c:1659
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "复制连接位置"
 
 # mail/mail-display.c:1607
 # mail/mail-display.c:1633
 # mail/mail-display.c:1662
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "连接保存为 (FIXME)"
 
 # mail/mail-display.c:1610
 # mail/mail-display.c:1636
 # mail/mail-display.c:1665
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "图像保存为..."
 
 # mail/mail-format.c:635
 # mail/mail-format.c:640
 # mail/mail-format.c:646
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -20979,56 +21344,56 @@ msgstr "%s 附件"
 # mail/mail-format.c:680
 # mail/mail-format.c:686
 # mail/mail-format.c:692
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
 # mail/mail-format.c:763
 # mail/mail-format.c:769
 # mail/mail-format.c:775
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
 # mail/mail-format.c:846
 # mail/mail-format.c:861
 # mail/mail-format.c:867
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "无效地址"
 
 # mail/mail-format.c:886 mail/message-list.etspec.h:3
 # mail/mail-format.c:904 mail/message-list.etspec.h:3
 # mail/mail-format.c:910 mail/message-list.etspec.h:3
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "发件人"
 
 # mail/mail-format.c:889
 # mail/mail-format.c:908
 # mail/mail-format.c:914
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "回复至"
 
 # mail/mail-format.c:893 mail/message-list.etspec.h:10
 # mail/mail-format.c:913 mail/message-list.etspec.h:11
 # mail/mail-format.c:919 mail/message-list.etspec.h:11
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件人"
 
 # mail/mail-format.c:897
 # mail/mail-format.c:918
 # mail/mail-format.c:924
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "抄送"
 
 # mail/mail-format.c:901
 # mail/mail-format.c:923
 # mail/mail-format.c:929
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 msgid "Bcc"
 msgstr "密件抄送"
 
@@ -21038,23 +21403,15 @@ msgstr "密件抄送"
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr "邮件"
 
-# mail/mail-callbacks.c:1962
-# mail/mail-callbacks.c:2081
-# mail/mail-callbacks.c:2117
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "消息另存为..."
-
 # mail/mail-format.c:1813
 # mail/mail-format.c:1749
 # mail/mail-format.c:1768
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
@@ -21062,7 +21419,7 @@ msgstr "该邮件有数字签名。单击锁图标以获得更多信息。"
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "无法创建 PGP 验证上下文。"
@@ -21070,21 +21427,21 @@ msgstr "无法创建 PGP 验证上下文。"
 # mail/mail-format.c:1844
 # mail/mail-format.c:1780
 # mail/mail-format.c:1799
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "该邮件有数字签名，并被证实为可信。"
 
 # mail/mail-format.c:1852
 # mail/mail-format.c:1788
 # mail/mail-format.c:1807
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "该邮件有数字签名，但不能证实是可信的。"
 
 # mail/mail-format.c:2068
 # mail/mail-format.c:2003
 # mail/mail-format.c:2022
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
@@ -21092,7 +21449,7 @@ msgstr "指向 FTP 站点 (%s)"
 # mail/mail-format.c:2082
 # mail/mail-format.c:2017
 # mail/mail-format.c:2036
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
@@ -21100,7 +21457,7 @@ msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 # mail/mail-format.c:2087
 # mail/mail-format.c:2022
 # mail/mail-format.c:2041
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
@@ -21108,7 +21465,7 @@ msgstr "指向本地文件 (%s)"
 # mail/mail-format.c:2116
 # mail/mail-format.c:2051
 # mail/mail-format.c:2070
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
@@ -21116,7 +21473,7 @@ msgstr "指向远程数据 (%s)"
 # mail/mail-format.c:2124
 # mail/mail-format.c:2059
 # mail/mail-format.c:2078
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -21124,14 +21481,14 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 # mail/mail-format.c:2129
 # mail/mail-format.c:2064
 # mail/mail-format.c:2083
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "本地文件夹"
@@ -21139,17 +21496,17 @@ msgstr "本地文件夹"
 # mail/mail-local.c:626
 # mail/mail-local.c:626
 # mail/mail-local.c:626
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 msgid "Reconfiguring folder"
 msgstr "正在重新配置文件夹"
 
 # mail/mail-local.c:707
 # mail/mail-local.c:707
 # mail/mail-local.c:707
-#: mail/mail-local.c:751
-#, c-format
+#: mail/mail-local.c:753
+#, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "无法保存文件夹元信息；您可能无法再\n"
@@ -21158,7 +21515,7 @@ msgstr ""
 # mail/mail-local.c:763
 # mail/mail-local.c:763
 # mail/mail-local.c:763
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "无法把文件夹元信息保存到 %s： %s"
@@ -21166,7 +21523,7 @@ msgstr "无法把文件夹元信息保存到 %s： %s"
 # mail/mail-local.c:815
 # mail/mail-local.c:815
 # mail/mail-local.c:815
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "无法删除文件夹元信息 %s： %s"
@@ -21174,7 +21531,7 @@ msgstr "无法删除文件夹元信息 %s： %s"
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
 # mail/mail-local.c:1281
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "将文件夹格式从“%s”改为“%s”"
@@ -21182,7 +21539,7 @@ msgstr "将文件夹格式从“%s”改为“%s”"
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
 # mail/mail-local.c:1296
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
@@ -21190,7 +21547,7 @@ msgstr "由于 %s 不是本地文件夹，因此不能重新配置"
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
 # mail/mail-local.c:1318
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -21201,14 +21558,14 @@ msgstr ""
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
 # mail/mail-local.c:1407
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "您不能改变远程文件夹的格式。"
 
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
 # mail/mail-local.c:1416
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "重新配置 /%s"
@@ -21216,7 +21573,7 @@ msgstr "重新配置 /%s"
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
 # mail/mail-mt.c:254
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -21228,7 +21585,7 @@ msgstr ""
 # mail/mail-mt.c:257
 # mail/mail-mt.c:257
 # mail/mail-mt.c:257
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -21240,7 +21597,7 @@ msgstr ""
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
 # mail/mail-mt.c:901
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "正在工作"
 
@@ -21254,21 +21611,21 @@ msgstr "正在过滤文件夹"
 # mail/mail-ops.c:249
 # mail/mail-ops.c:250
 # mail/mail-ops.c:258
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "正在收取邮件"
 
 # mail/mail-ops.c:489 mail/mail-ops.c:518
 # mail/mail-ops.c:491 mail/mail-ops.c:520
 # mail/mail-ops.c:534 mail/mail-ops.c:563
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr "可是，邮件已经成功发送。"
 
 # mail/mail-ops.c:554
 # mail/mail-ops.c:556
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "正在发送“%s”"
@@ -21276,7 +21633,7 @@ msgstr "正在发送“%s”"
 # mail/mail-ops.c:674
 # mail/mail-ops.c:676
 # mail/mail-ops.c:719
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
@@ -21284,7 +21641,7 @@ msgstr "发送第 %d 个邮件，共 %d 个"
 # mail/mail-ops.c:693
 # mail/mail-ops.c:695
 # mail/mail-ops.c:738
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "在第 %d 个邮件失败，共 %d 个"
@@ -21292,21 +21649,21 @@ msgstr "在第 %d 个邮件失败，共 %d 个"
 # mail/mail-ops.c:695 mail/mail-send-recv.c:537
 # mail/mail-ops.c:697 mail/mail-send-recv.c:545
 # mail/mail-ops.c:740 mail/mail-send-recv.c:545
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:788
 # mail/mail-ops.c:790
 # mail/mail-ops.c:833
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
@@ -21314,7 +21671,7 @@ msgstr "把邮件移动到 %s"
 # mail/mail-ops.c:868
 # mail/mail-ops.c:870
 # mail/mail-ops.c:913
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
@@ -21322,7 +21679,7 @@ msgstr "把邮件复制到 %s"
 # mail/mail-ops.c:1008
 # mail/mail-ops.c:1010
 # mail/mail-ops.c:1053
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
@@ -21330,14 +21687,14 @@ msgstr "正在“%s”中扫描文件夹"
 # mail/mail-ops.c:1191
 # mail/mail-ops.c:1193
 # mail/mail-ops.c:1236
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "已转发邮件"
 
 # mail/mail-ops.c:1234
 # mail/mail-ops.c:1236
 # mail/mail-ops.c:1279
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
@@ -21345,7 +21702,7 @@ msgstr "正在打开文件夹 %s"
 # mail/mail-ops.c:1306
 # mail/mail-ops.c:1308
 # mail/mail-ops.c:1351
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
@@ -21353,7 +21710,7 @@ msgstr "正在打开存储 %s"
 # mail/mail-ops.c:1375
 # mail/mail-ops.c:1377
 # mail/mail-ops.c:1420
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
@@ -21361,7 +21718,7 @@ msgstr "正在删除文件夹“%s”"
 # mail/mail-ops.c:1469
 # mail/mail-ops.c:1471
 # mail/mail-ops.c:1514
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
@@ -21369,21 +21726,21 @@ msgstr "正在存储文件夹“%s”"
 # mail/mail-ops.c:1520
 # mail/mail-ops.c:1522
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
 # mail/mail-ops.c:1556
 # mail/mail-ops.c:1558
 # mail/mail-ops.c:1601
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "正在删除文件夹"
 
 # mail/mail-ops.c:1605
 # mail/mail-ops.c:1607
 # mail/mail-ops.c:1650
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在检索邮件 %s"
@@ -21391,7 +21748,7 @@ msgstr "正在检索邮件 %s"
 # mail/mail-ops.c:1672
 # mail/mail-ops.c:1674
 # mail/mail-ops.c:1717
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "正在检索 %d 个邮件"
@@ -21399,7 +21756,7 @@ msgstr "正在检索 %d 个邮件"
 # mail/mail-ops.c:1758
 # mail/mail-ops.c:1760
 # mail/mail-ops.c:1803
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "正在保存 %d 个邮件"
@@ -21407,7 +21764,7 @@ msgstr "正在保存 %d 个邮件"
 # mail/mail-ops.c:1870
 # mail/mail-ops.c:1872
 # mail/mail-ops.c:1915
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -21419,7 +21776,7 @@ msgstr ""
 # mail/mail-ops.c:1898
 # mail/mail-ops.c:1900
 # mail/mail-ops.c:1943
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -21431,14 +21788,14 @@ msgstr ""
 # mail/mail-ops.c:1972
 # mail/mail-ops.c:1974
 # mail/mail-ops.c:2017
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
 # mail/mail-ops.c:1988
 # mail/mail-ops.c:1990
 # mail/mail-ops.c:2033
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -21450,7 +21807,7 @@ msgstr ""
 # mail/mail-ops.c:2019
 # mail/mail-ops.c:2021
 # mail/mail-ops.c:2064
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据： %s"
@@ -21458,7 +21815,7 @@ msgstr "无法写数据： %s"
 # mail/mail-ops.c:2088
 # mail/mail-ops.c:2090
 # mail/mail-ops.c:2133
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "断开与 %s 的连接"
@@ -21466,21 +21823,15 @@ msgstr "断开与 %s 的连接"
 # mail/mail-ops.c:2089
 # mail/mail-ops.c:2091
 # mail/mail-ops.c:2134
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新与 %s 连接"
 
-# mail/mail-ops.c:2233
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr "正在执行 shell 命令：%s"
-
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "搜索(_S)"
 
@@ -21574,42 +21925,57 @@ msgstr "类型： %s"
 # mail/mail-send-recv.c:286
 # mail/mail-send-recv.c:292
 # mail/mail-send-recv.c:292
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
 # mail/mail-send-recv.c:288
 # mail/mail-send-recv.c:294
 # mail/mail-send-recv.c:294
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 msgid "Cancel All"
 msgstr "全部取消"
 
 # mail/mail-send-recv.c:348
 # mail/mail-send-recv.c:354
 # mail/mail-send-recv.c:354
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "正在更新..."
 
 # mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
 # mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:220
 # mail/mail-session.c:220
 # mail/mail-session.c:222
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:113
+# mail/mail-config.glade.h:122
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
+
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:268
+# e-util/e-passwords.c:362 mail/mail-session.c:270
+#: mail/mail-session.c:277
+#, fuzzy
+msgid "_Remember this password for the remainder of this session"
+msgstr "在本会话中记住该密码"
+
 # mail/mail-session.c:319
 # mail/mail-session.c:319
 # mail/mail-session.c:321
-#: mail/mail-session.c:321
+#: mail/mail-session.c:334
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
@@ -21617,7 +21983,7 @@ msgstr "为 %s 输入密码"
 # mail/mail-session.c:322
 # mail/mail-session.c:322
 # mail/mail-session.c:324
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 msgid "Enter Password"
 msgstr "输入密码"
 
@@ -21656,7 +22022,7 @@ msgstr ""
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:956
 # my-evolution/e-summary-preferences.c:958
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "名称："
 
@@ -21701,7 +22067,7 @@ msgstr "已转发邮件"
 # mail/mail-tools.c:393
 # mail/mail-tools.c:393
 # mail/mail-tools.c:394
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "已转发邮件"
 
@@ -21724,7 +22090,7 @@ msgstr "为 uri 更新虚拟文件夹： %s"
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
 # mail/mail-vfolder.c:419
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -21736,29 +22102,28 @@ msgstr ""
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
 # mail/mail-vfolder.c:728
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 msgid "VFolders"
 msgstr "虚拟文件夹"
 
 # camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:831
 # mail/mail-vfolder.c:785
 # mail/mail-vfolder.c:785
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
 # mail/mail-vfolder.c:824
 # mail/mail-vfolder.c:825
 # mail/mail-vfolder.c:825
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
 # mail/mail-vfolder.c:840
 # mail/mail-vfolder.c:841
 # mail/mail-vfolder.c:841
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
@@ -21766,21 +22131,21 @@ msgstr "试图编辑并不存在的虚拟文件夹“%s”。"
 # mail/mail-vfolder.c:894
 # mail/mail-vfolder.c:895
 # mail/mail-vfolder.c:895
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
 # mail/message-browser.c:212
 # mail/message-browser.c:212
 # mail/message-browser.c:212
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(没有主题)"
 
 # mail/message-browser.c:214
 # mail/message-browser.c:214
 # mail/message-browser.c:214
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - 邮件"
@@ -21788,105 +22153,109 @@ msgstr "%s - 邮件"
 # mail/message-list.c:639
 # mail/message-list.c:645
 # mail/message-list.c:662
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "不可见"
 
 # mail/message-list.c:640
 # mail/message-list.c:646
 # mail/message-list.c:663
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "可见"
 
 # mail/message-list.c:641
 # mail/message-list.c:647
 # mail/message-list.c:664
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "已应答"
 
 # mail/message-list.c:642
 # mail/message-list.c:648
 # mail/message-list.c:665
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "多个不可见邮件"
 
 # mail/message-list.c:643
 # mail/message-list.c:649
 # mail/message-list.c:666
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "多个邮件"
 
 # mail/message-list.c:647
 # mail/message-list.c:658
 # mail/message-list.c:675
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:648
 # mail/message-list.c:659
 # mail/message-list.c:676
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "较低"
 
 # mail/message-list.c:652
 # mail/message-list.c:663
 # mail/message-list.c:680
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "较高"
 
 # mail/message-list.c:653
 # mail/message-list.c:664
 # mail/message-list.c:681
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:903
 # mail/message-list.c:920
 # mail/message-list.c:937
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "?"
 
 # mail/message-list.c:910
 # mail/message-list.c:927
 # mail/message-list.c:944
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:919
 # mail/message-list.c:936
 # mail/message-list.c:953
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:931
 # mail/message-list.c:948
 # mail/message-list.c:965
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%m %p"
 
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
 # mail/message-list.c:941
 # mail/message-list.c:958
 # mail/message-list.c:975
-#: mail/message-list.c:1105
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
 # mail/message-list.c:2334
 # mail/message-list.c:2358
 # mail/message-list.c:2387
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
@@ -21953,7 +22322,7 @@ msgstr "大小"
 # importers/elm-importer.c:525 importers/netscape-importer.c:958
 # importers/pine-importer.c:637 mail/component-factory.c:100
 # my-evolution/Locations.h:1355
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "邮件"
@@ -21961,19 +22330,19 @@ msgstr "邮件"
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "转发"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:81
 # mail/mail-config.glade.h:90
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "来源信息"
@@ -21981,37 +22350,37 @@ msgstr "来源信息"
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
 # ui/evolution-mail-message.xml.h:31
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "转发"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:70
 # ui/evolution-mail-message.xml.h:72
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "回复"
 
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:71
 # ui/evolution-mail-message.xml.h:73
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "全部回复"
 
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
 # calendar/gui/dialogs/recurrence-page.glade.h:6
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "预览"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -22053,7 +22422,7 @@ msgstr "取消到文件夹“%s”的订阅"
 # shell/e-storage-set-view.etspec.h:1
 # mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
 # shell/e-storage-set-view.etspec.h:1
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "文件夹"
@@ -22061,14 +22430,14 @@ msgstr "文件夹"
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
 # mail/subscribe-dialog.c:1520
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "没有选定服务器"
 
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
 # mail/subscribe-dialog.c:1581
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
@@ -29018,14 +29387,12 @@ msgstr "昆明"
 msgid "Kushiro Airport"
 msgstr ""
 
-# my-evolution/Locations.h:1147
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
-# my-evolution/Locations.h:1148
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 # my-evolution/Locations.h:1149
@@ -37561,8 +37928,8 @@ msgstr "邮件概要"
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
 # shell/e-local-storage.c:636
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 msgid "Local Folders"
 msgstr "本地文件夹"
 
@@ -37592,21 +37959,21 @@ msgstr "Dictionary.com 的每日一词"
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:465
 # my-evolution/e-summary-preferences.c:466
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "每日引用"
 
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:944
 # my-evolution/e-summary-preferences.c:946
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "添加新闻来源"
 
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:952
 # my-evolution/e-summary-preferences.c:954
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "输入您希望添加的新闻来源的 URL"
 
@@ -37627,7 +37994,7 @@ msgid "News Feed"
 msgstr "新闻来源"
 
 # my-evolution/Locations.h:1354
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 #, fuzzy
 msgid "All"
 msgstr "麦卡伦"
@@ -37636,7 +38003,7 @@ msgstr "麦卡伦"
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 # calendar/gui/dialogs/recurrence-page.glade.h:1
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "添加(_D)"
@@ -37644,7 +38011,7 @@ msgstr "添加(_D)"
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
 # my-evolution/metar.c:157
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "雪"
@@ -37652,14 +38019,14 @@ msgstr "雪"
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:248
 # my-evolution/e-summary-tasks.c:241
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "没有任务"
 
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:287
 # my-evolution/e-summary-tasks.c:281
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 msgid "(No Description)"
 msgstr "(没有描述)"
 
@@ -39862,7 +40229,8 @@ msgstr "任务 "
 # my-evolution/my-evolution.glade.h:20
 # my-evolution/my-evolution.glade.h:20
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "天气设置"
 
 # my-evolution/my-evolution.glade.h:25
@@ -39954,7 +40322,7 @@ msgstr "取消操作"
 # shell/e-storage-set-view.c:658
 # shell/e-storage-set-view.c:658
 # shell/e-storage-set-view.c:658
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -39977,22 +40345,22 @@ msgstr "文件夹"
 # mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 # mail/mail-config.glade.h:30 shell/e-local-storage.c:173
 # mail/mail-config.glade.h:36 shell/e-local-storage.c:173
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "草稿"
 
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
 # shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "收件箱"
 
 # shell/e-local-storage.c:175
 # shell/e-local-storage.c:175
 # shell/e-local-storage.c:175
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr "发件箱"
 
@@ -40002,7 +40370,7 @@ msgstr "发件箱"
 # shell/e-local-storage.c:176
 # mail/mail-config.glade.h:82 mail/message-list.etspec.h:7
 # shell/e-local-storage.c:176
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "已发送"
 
@@ -40346,35 +40714,25 @@ msgstr ""
 "无法创建指定的文件夹：\n"
 "%s"
 
-# shell/e-shell-folder-creation-dialog.c:267
-# shell/e-shell-folder-creation-dialog.c:267
-# shell/e-shell-folder-creation-dialog.c:304
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - 创建新文件夹"
-
-# shell/e-shell-folder-selection-dialog.c:98
-# shell/e-shell-folder-selection-dialog.c:98
-# shell/e-shell-folder-selection-dialog.c:98
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"文件夹的类型对于请求的\n"
-"操作来说是不合法的。"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "创建新文件夹(_N)..."
 
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
 # shell/e-shell-folder-selection-dialog.c:376
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "正在新建..."
 
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 # shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(无标题)"
 
@@ -40403,7 +40761,7 @@ msgstr ""
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:799
 # shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
@@ -40446,7 +40804,7 @@ msgstr "选择文件夹"
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:397
 # shell/e-shell-importer.c:409
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
@@ -40455,22 +40813,15 @@ msgstr "文件 %s 不存在"
 # shell/e-shell-about-box.c:40
 # shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
 # shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 msgid "Evolution Error"
 msgstr "Evolution 错误"
 
-# shell/e-shell-importer.c:409
-# shell/e-shell-importer.c:409
-# shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr "您只能导入到本地文件夹"
-
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:424
 # shell/e-shell-importer.c:435
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -40482,14 +40833,14 @@ msgstr ""
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:434
 # shell/e-shell-importer.c:445
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "正在导入"
 
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:442
 # shell/e-shell-importer.c:453
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -40501,7 +40852,7 @@ msgstr ""
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:455
 # shell/e-shell-importer.c:466
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "启动 %s 错误"
@@ -40509,7 +40860,7 @@ msgstr "启动 %s 错误"
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:474
 # shell/e-shell-importer.c:485
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "装入 %s 错误"
@@ -40517,7 +40868,7 @@ msgstr "装入 %s 错误"
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:491
 # shell/e-shell-importer.c:502
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -40529,49 +40880,49 @@ msgstr ""
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:561
 # shell/e-shell-importer.c:572
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "自动"
 
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:612
 # shell/e-shell-importer.c:623
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "文件名："
 
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:617
 # shell/e-shell-importer.c:628
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "选择一个文件"
 
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:627
 # shell/e-shell-importer.c:638
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "文件类型："
 
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:652
 # shell/e-shell-importer.c:663
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr "从老版程序中导入数据和设置"
 
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:656
 # shell/e-shell-importer.c:667
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 msgid "Import a single file"
 msgstr "导入单个文件"
 
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:628
 # shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -40582,14 +40933,14 @@ msgstr ""
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "启动智能导入器"
 
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:754
 # shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
@@ -40597,21 +40948,21 @@ msgstr "从 %s："
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1014
 # shell/e-shell-importer.c:1027
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "选择文件夹"
 
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1015
 # shell/e-shell-importer.c:1028
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "为导入的数据选择目标文件夹"
 
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1127 shell/importer/intelligent.c:193
 # shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "导入"
 
@@ -40680,12 +41031,20 @@ msgstr "正在打开文件夹 %s"
 msgid "in \"%s\" ..."
 msgstr "在 %s 中打开..."
 
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+# camel/providers/local/camel-mbox-summary.c:650
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "无法重命名文件夹： %s"
+
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:111
 # shell/e-shell-folder-creation-dialog.c:125
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "无法创建指定的文件夹：\n"
 "%s"
@@ -40714,8 +41073,8 @@ msgstr "无法启动 Evolution 邮件助手界面\n"
 # shell/e-shell-user-creatable-items-handler.c:495
 # shell/e-shell-user-creatable-items-handler.c:540
 # widgets/misc/e-charset-picker.c:104
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "新建"
@@ -40786,49 +41145,50 @@ msgstr "选择您希望打开的文件夹"
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
 # shell/e-shell-view-menu.c:545
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "创建新快捷方式"
 
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
 # shell/e-shell-view-menu.c:546
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "选择您希望快捷方式指向的文件夹："
 
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
 # shell/e-shell-view-menu.c:688
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
 # shell/e-shell-view-menu.c:701 ui/evolution.xml.h:51
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
 # shell/e-shell-view-menu.c:714 ui/evolution.xml.h:30
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "离线工作"
 
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:214
 # shell/e-shell-view.c:215
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(未显示文件夹)"
 
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1585
 # shell/e-shell-view.c:1598
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -40836,14 +41196,14 @@ msgstr "%s (%d)"
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1587
 # shell/e-shell-view.c:1600
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(无)"
 
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1634
 # shell/e-shell-view.c:1647
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
@@ -40851,14 +41211,14 @@ msgstr "Ximian Evolution 目前在线。 点击该按钮则离线工作。"
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1641
 # shell/e-shell-view.c:1654
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution 正在离线过程中。"
 
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1647
 # shell/e-shell-view.c:1660
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
@@ -40866,7 +41226,7 @@ msgstr "Ximian Evolution 目前离线。 点击该按钮则在线工作。"
 # shell/evolution-shell-component-utils.c:134
 # shell/evolution-shell-component-utils.c:134
 # shell/evolution-shell-component-utils.c:134
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, fuzzy, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -40881,7 +41241,7 @@ msgstr ""
 # shell/e-shell.c:651
 # shell/e-shell.c:651
 # shell/e-shell.c:651
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "无法设置本地存储 -- %s"
@@ -40889,7 +41249,7 @@ msgstr "无法设置本地存储 -- %s"
 # shell/e-shell.c:1659
 # shell/e-shell.c:1659
 # shell/e-shell.c:1660
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -40903,49 +41263,49 @@ msgstr ""
 # shell/e-shell.c:1886
 # shell/e-shell.c:1886
 # shell/e-shell.c:1887
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "无效参数"
 
 # shell/e-shell.c:1888
 # shell/e-shell.c:1888
 # shell/e-shell.c:1889
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
 # shell/e-shell.c:1890
 # shell/e-shell.c:1890
 # shell/e-shell.c:1891
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1892 shell/e-storage.c:500
 # shell/e-shell.c:1893 shell/e-storage.c:500
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "通用错误"
 
 # shell/e-shortcuts-view.c:74
 # shell/e-shortcuts-view.c:74
 # shell/e-shortcuts-view.c:74
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "创建新快捷方式组"
 
 # shell/e-shortcuts-view.c:75
 # shell/e-shortcuts-view.c:75
 # shell/e-shortcuts-view.c:75
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "组名："
 
 # shell/e-shortcuts-view.c:175
 # shell/e-shortcuts-view.c:175
 # shell/e-shortcuts-view.c:175
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -40957,182 +41317,198 @@ msgstr ""
 # shell/e-shortcuts-view.c:180
 # shell/e-shortcuts-view.c:180
 # shell/e-shortcuts-view.c:180
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "不删除"
 
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
 # shell/e-shortcuts-view.c:209
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "重命名快捷方式组"
 
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
 # shell/e-shortcuts-view.c:210
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "把选中的快捷方式组重命名为："
 
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
 # shell/e-shortcuts-view.c:224
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "小图标(_S)"
 
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
 # shell/e-shortcuts-view.c:225
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "用小图标显示快捷方式"
 
 # shell/e-shortcuts-view.c:227
 # shell/e-shortcuts-view.c:227
 # shell/e-shortcuts-view.c:227
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "大图标(_L)"
 
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
 # shell/e-shortcuts-view.c:228
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "用大图标显示快捷方式"
 
 # shell/e-shortcuts-view.c:239
 # shell/e-shortcuts-view.c:239
 # shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "新组(_N)..."
 
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
 # shell/e-shortcuts-view.c:240
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "创建新快捷方式组"
 
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
 # shell/e-shortcuts-view.c:242
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "删除该组(_R)..."
 
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
 # shell/e-shortcuts-view.c:243
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "删除该快捷方式组"
 
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
 # shell/e-shortcuts-view.c:245
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "重命名该组(_N)..."
 
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
 # shell/e-shortcuts-view.c:246
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "重命名该快捷方式组"
 
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
 # shell/e-shortcuts-view.c:251
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "隐藏快捷方式栏(_H)"
 
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
 # shell/e-shortcuts-view.c:252
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "隐藏快捷方式栏"
 
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "创建新快捷方式"
+
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "创建新快捷方式"
+
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
 # shell/e-shortcuts-view.c:371
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "重命名快捷方式"
 
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
 # shell/e-shortcuts-view.c:372
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "把快捷方式重命名为："
 
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
 # shell/e-shortcuts-view.c:384
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "打开连接到该快捷方式的文件夹"
 
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 # shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
 
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
 # shell/e-shortcuts-view.c:386
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "在新窗口中打开连接到该快捷方式的文件夹"
 
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
 # shell/e-shortcuts-view.c:389
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "重命名该快捷方式"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "删除(_M)"
 
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
 # shell/e-shortcuts-view.c:391
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "从快捷方式栏上删除该快捷方式"
 
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
 # shell/e-shortcuts.c:640
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "保存快捷方式错误。"
 
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
 # shell/e-shortcuts.c:1043
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "快捷方式"
 
@@ -41149,91 +41525,91 @@ msgstr "主席"
 # shell/e-storage.c:498
 # shell/e-storage.c:498
 # shell/e-storage.c:498
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "无错误"
 
 # shell/e-storage.c:502
 # shell/e-storage.c:502
 # shell/e-storage.c:502
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "已经有一个同名文件夹存在"
 
 # shell/e-storage.c:504
 # shell/e-storage.c:504
 # shell/e-storage.c:504
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "指定的文件夹类型无效"
 
 # shell/e-storage.c:506
 # shell/e-storage.c:506
 # shell/e-storage.c:506
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "输入输出错误"
 
 # shell/e-storage.c:508
 # shell/e-storage.c:508
 # shell/e-storage.c:508
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "没有足够的空间创建文件夹"
 
 # shell/e-storage.c:510
 # shell/e-storage.c:510
 # shell/e-storage.c:510
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr "文件夹不为空"
 
 # shell/e-storage.c:512
 # shell/e-storage.c:512
 # shell/e-storage.c:512
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "找不到指定的文件夹"
 
 # shell/e-storage.c:514
 # shell/e-storage.c:514
 # shell/e-storage.c:514
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "在该存储中没有实现该功能"
 
 # shell/e-storage.c:518
 # shell/e-storage.c:518
 # shell/e-storage.c:518
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "不支持的操作"
 
 # shell/e-storage.c:520
 # shell/e-storage.c:520
 # shell/e-storage.c:520
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "在该存储中不支持指定的类型"
 
 # shell/e-storage.c:522
 # shell/e-storage.c:522
 # shell/e-storage.c:522
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "无法修改或删除指定的文件夹"
 
 # shell/e-storage.c:524
 # shell/e-storage.c:524
 # shell/e-storage.c:524
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "无法使文件夹成为它的子目录的子目录"
 
 # shell/e-storage.c:526
 # shell/e-storage.c:526
 # shell/e-storage.c:526
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Cannot create a folder with that name"
 msgstr "无法以那个名字创建文件夹"
 
@@ -41306,105 +41682,105 @@ msgstr ""
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1009
 # shell/evolution-shell-component.c:1022
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 msgid "CORBA error"
 msgstr "CORBA 错误"
 
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1011
 # shell/evolution-shell-component.c:1024
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr "被中断"
 
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1013
 # shell/evolution-shell-component.c:1026
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 msgid "Invalid argument"
 msgstr "无效参数"
 
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1015
 # shell/evolution-shell-component.c:1028
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr "已经有所有者了"
 
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1017
 # shell/evolution-shell-component.c:1030
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 msgid "No owner"
 msgstr "无所有者"
 
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1019
 # shell/evolution-shell-component.c:1032
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 msgid "Not found"
 msgstr "没找到"
 
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1021
 # shell/evolution-shell-component.c:1034
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 msgid "Unsupported type"
 msgstr "不支持的类型"
 
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1023
 # shell/evolution-shell-component.c:1036
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr "不支持的方案"
 
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1025
 # shell/evolution-shell-component.c:1038
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 msgid "Unsupported operation"
 msgstr "不支持的操作"
 
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1027
 # shell/evolution-shell-component.c:1040
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 msgid "Internal error"
 msgstr "内部错误"
 
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1031
 # shell/evolution-shell-component.c:1044
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 msgid "Exists"
 msgstr "存在"
 
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1033
 # shell/evolution-shell-component.c:1046
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 msgid "Invalid URI"
 msgstr "无效 URI"
 
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1037
 # shell/evolution-shell-component.c:1050
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 msgid "Has subfolders"
 msgstr "含有子文件夹"
 
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1039
 # shell/evolution-shell-component.c:1052
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 msgid "No space left"
 msgstr "没有剩余空间"
 
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1041
 # shell/evolution-shell-component.c:1054
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr "原所有者已死"
 
@@ -41443,6 +41819,50 @@ msgstr "主机"
 msgid "The following connections are currently active:"
 msgstr "下列连接正处于活跃状态："
 
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+# calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:7
+# shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "日历"
+
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+# calendar/gui/print.c:2331
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "联系人："
+
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+# my-evolution/my-evolution.glade.h:27
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "邮件(_M)"
+
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:247 my-evolution/e-summary-tasks.c:263
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+# calendar/gui/component-factory.c:68 calendar/gui/print.c:1733
+# my-evolution/e-summary-tasks.c:240 my-evolution/e-summary-tasks.c:257
+# shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
+# views/tasks/galview.xml.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "任务"
+
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
@@ -41464,6 +41884,46 @@ msgstr "文件夹类型："
 msgid "Specify where to create the folder:"
 msgstr "指定在那里创建文件夹："
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+# ui/evolution.xml.h:7
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "创建新文件夹(_N)..."
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "文件夹名称："
+
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:28
+# addressbook/gui/component/addressbook-config.glade.h:37
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "服务器名(_S)："
+
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:117
+# mail/mail-config.glade.h:126
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "用户名(_U)："
+
 # shell/glade/evolution-startup-wizard.glade.h:3
 # shell/glade/evolution-startup-wizard.glade.h:3
 # shell/glade/evolution-startup-wizard.glade.h:3
@@ -41617,18 +42077,18 @@ msgstr "Evolution 可以从下列文件中导入数据："
 # data/evolution.desktop.in.h:1 shell/main.c:83
 # shell/main.c:83
 # shell/main.c:83
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
 # shell/main.c:89
 # shell/main.c:89
 # shell/main.c:89
-#: shell/main.c:97
+#: shell/main.c:98
 msgid "Evolution is now exiting ..."
 msgstr "Evolution 正在退出 ..."
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -41651,7 +42111,7 @@ msgstr ""
 # ui/evolution.xml.h:31
 # data/evolution.desktop.in.h:2
 # data/evolution.desktop.in.h:2
-#: shell/main.c:245
+#: shell/main.c:246
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -41661,7 +42121,7 @@ msgstr "Ximian Evolution"
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
 # shell/importer/intelligent.c:198
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "不要再问我"
@@ -41669,14 +42129,14 @@ msgstr "不要再问我"
 # shell/main.c:210
 # shell/main.c:210
 # shell/main.c:210
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "无法访问 Ximian Evolution shell。"
 
 # shell/main.c:219
 # shell/main.c:219
 # shell/main.c:219
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "无法初始化 Ximian Evolution shell： %s"
@@ -41684,14 +42144,14 @@ msgstr "无法初始化 Ximian Evolution shell： %s"
 # shell/main.c:289
 # shell/main.c:289
 # shell/main.c:289
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "禁用启动屏幕"
 
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
 # importers/netscape-importer.c:897
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "开始导入"
@@ -41699,7 +42159,7 @@ msgstr "开始导入"
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:631
 # shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "启动智能导入器"
@@ -41707,11 +42167,11 @@ msgstr "启动智能导入器"
 # shell/main.c:290
 # shell/main.c:290
 # shell/main.c:290
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -41721,7 +42181,7 @@ msgstr ""
 # shell/main.c:332
 # shell/main.c:332
 # shell/main.c:332
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "无法初始化 Bonobo 成员系统。"
 
@@ -41784,38 +42244,24 @@ msgstr "复制选中内容"
 msgid "Copy to Folder..."
 msgstr "复制到文件夹..."
 
-# ui/evolution-addressbook.xml.h:4
-# ui/evolution-addressbook.xml.h:4
-# ui/evolution-addressbook.xml.h:4
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "创建新的联系人"
-
-# ui/evolution-addressbook.xml.h:5
-# ui/evolution-addressbook.xml.h:5
-# ui/evolution-addressbook.xml.h:5
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "创建新的联系人列表"
-
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
 # ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:10
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
 # ui/evolution-addressbook.xml.h:9
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
 # ui/evolution-mail-message.xml.h:53
 # ui/evolution-mail-message.xml.h:53
 # ui/evolution-mail-message.xml.h:53
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "把选中的邮件移动到其它文件夹"
@@ -41823,7 +42269,7 @@ msgstr "把选中的邮件移动到其它文件夹"
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "移动到文件夹(_M)..."
@@ -41831,82 +42277,91 @@ msgstr "移动到文件夹(_M)..."
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
 # ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:23
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "打印预览(_V)"
+
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-addressbook.xml.h:18
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-addressbook.xml.h:20
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "把选中的联系人保存为 VCard。"
 
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
 # ui/evolution-addressbook.xml.h:21
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "全选"
 
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
 # ui/evolution-addressbook.xml.h:22
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "选中所有的联系人"
 
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
 # ui/evolution-addressbook.xml.h:24
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "给选定的联系人发邮件。"
 
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
 # ui/evolution-addressbook.xml.h:25
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "给联系人发邮件"
 
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
 # ui/evolution-addressbook.xml.h:26
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "把选中的联系人发送给其他人。"
 
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
 # ui/evolution-addressbook.xml.h:27
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "停止"
 
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
 # ui/evolution-addressbook.xml.h:28
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "停止载入"
 
 # ui/evolution-addressbook.xml.h:29
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
@@ -41928,62 +42383,55 @@ msgstr "查看当前联系人"
 # ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
 # ui/evolution-mail-message.xml.h:93 ui/evolution-mail-messagedisplay.xml.h:4
 # ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:16
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "动作(_A)"
 
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:32
-# ui/evolution-addressbook.xml.h:33
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "联系人列表(_C)"
-
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
 # ui/evolution-addressbook.xml.h:36 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
 # mail/folder-browser.c:1466
 # mail/folder-browser.c:1475
 # mail/folder-browser.c:1476
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "移动到文件夹(_M)..."
 
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:38
 # ui/evolution-addressbook.xml.h:40
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "另存为 VCard(_S)"
 
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:39
 # ui/evolution-addressbook.xml.h:41
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "搜索联系人(_S)"
 
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:40
 # ui/evolution-addressbook.xml.h:42
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "全选(_S)"
 
 # ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 # ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
 # ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "给联系人发邮件(_M)..."
@@ -42058,14 +42506,6 @@ msgstr "月"
 msgid "Previews the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-# ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "打印预览(_V)"
-
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
 # ui/evolution-calendar.xml.h:26
@@ -42134,7 +42574,7 @@ msgstr "周"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "关闭"
 
@@ -42159,7 +42599,7 @@ msgstr "删除这一项"
 # ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
 # ui/evolution.xml.h:16
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "主工具栏"
 
@@ -42183,8 +42623,8 @@ msgstr "打印该项"
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
 # ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
 # ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "保存"
 
@@ -42248,9 +42688,9 @@ msgstr "把该项保存到磁盘"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -42272,7 +42712,7 @@ msgstr "打印信封(_V)..."
 # ui/evolution-message-composer.xml.h:21
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
@@ -42304,8 +42744,8 @@ msgstr "给联系人发邮件(_M)..."
 # ui/evolution-signature-editor.xml.h:11
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -42470,45 +42910,61 @@ msgstr "打开窗口以书写邮件"
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的邮件"
 
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+# ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "新建邮件"
+
+# mail/mail-ops.c:788
+# mail/mail-ops.c:790
+# mail/mail-ops.c:833
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "把邮件保存到文件夹中"
+
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
 # ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "显示邮件预览窗口"
 
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
 # ui/evolution-mail-global.xml.h:16
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅 或 取消订阅远程服务器上的文件夹"
 
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
 # ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "虚拟文件夹编辑器(_E)..."
 
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
 # ui/evolution-mail-global.xml.h:19
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "邮件过滤(_F)..."
 
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
 # ui/evolution-mail-global.xml.h:22
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "预览窗口(_P)"
 
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
 # ui/evolution-mail-global.xml.h:24
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "订阅到文件夹(_S)..."
 
@@ -42677,7 +43133,7 @@ msgstr "删除(_E)"
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
 # ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "文件夹(_F)"
 
@@ -43116,10 +43572,26 @@ msgstr "原大小(_Z)"
 msgid "P_revious Unread Message"
 msgstr "上一个未读邮件"
 
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:946
+# calendar/gui/e-itip-control.c:1020
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Post a Reply"
+msgstr "任务回复"
+
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+# camel/providers/imap/camel-imap-provider.c:45
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "在所有文件夹中检查新邮件"
+
 # ui/evolution-mail-message.xml.h:64
 # ui/evolution-mail-message.xml.h:64
 # ui/evolution-mail-message.xml.h:64
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "上一个重要邮件"
@@ -43127,26 +43599,26 @@ msgstr "上一个重要邮件"
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
 # ui/evolution-mail-message.xml.h:62
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "预览需打印的邮件"
 
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
 # ui/evolution-mail-message.xml.h:63
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "上一个"
 
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
 # ui/evolution-mail-message.xml.h:69
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "打印该邮件"
 
 # ui/evolution-mail-message.xml.h:70
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 #, fuzzy
 msgid "Re_direct"
 msgstr "转发"
@@ -43154,133 +43626,133 @@ msgstr "转发"
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:38
 # ui/evolution-mail-message.xml.h:71
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选定的消息转发(退回)给某人"
 
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:74
 # ui/evolution-mail-message.xml.h:76
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "把文件重新设置为原来的大小"
 
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:75
 # ui/evolution-mail-message.xml.h:77
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "搜索邮件(_E)"
 
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:76
 # ui/evolution-mail-message.xml.h:78
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "更小(_M)"
 
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:77
 # ui/evolution-mail-message.xml.h:79
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "把邮件存为文本文件"
 
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:78
 # ui/evolution-mail-message.xml.h:80
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示邮件的邮件体中搜索文本"
 
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:79
 # ui/evolution-mail-message.xml.h:81
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "设定您当前打印机的页面设置"
 
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:80
 # ui/evolution-mail-message.xml.h:82
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "显示电子邮件源代码(_S)"
 
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:81
 # ui/evolution-mail-message.xml.h:83
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "显示完整的邮件头(_H)"
 
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:82
 # ui/evolution-mail-message.xml.h:84
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "以常用方式显示邮件"
 
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:83
 # ui/evolution-mail-message.xml.h:85
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "显示邮件时显示所有邮件头"
 
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:84
 # ui/evolution-mail-message.xml.h:86
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "显示邮件的原始邮件源代码"
 
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:85
 # ui/evolution-mail-message.xml.h:87
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "文本大小(_Z)"
 
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:86
 # ui/evolution-mail-message.xml.h:88
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "反删除选中的邮件"
 
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:87
 # ui/evolution-mail-message.xml.h:89
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "关于邮件列表的虚拟文件夹(_L)..."
 
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:88
 # ui/evolution-mail-message.xml.h:90
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "关于发件人的虚拟文件夹(_N)..."
 
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:89
 # ui/evolution-mail-message.xml.h:91
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "关于收件人的虚拟文件夹(_R)..."
 
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:90
 # ui/evolution-mail-message.xml.h:92
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "关于主题的虚拟文件夹(_S)..."
 
 # ui/evolution-message-composer.xml.h:1
 # ui/evolution-message-composer.xml.h:1
 # ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "附加"
@@ -43288,28 +43760,28 @@ msgstr "附加"
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:93
 # ui/evolution-mail-message.xml.h:95
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:94
 # ui/evolution-mail-message.xml.h:96
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "从邮件创建过滤规则(_C)"
 
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:97
 # ui/evolution-mail-message.xml.h:99
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "转发邮件(_F)"
 
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
 # ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:40
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "转到"
@@ -43317,7 +43789,7 @@ msgstr "转到"
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:39
 # mail/mail-config.glade.h:46
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "嵌入"
@@ -43325,28 +43797,28 @@ msgstr "嵌入"
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:98
 # ui/evolution-mail-message.xml.h:100
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "更大(_L)"
 
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:99
 # ui/evolution-mail-message.xml.h:101
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "邮件显示(_M)"
 
 # ui/evolution-mail-message.xml.h:100
 # ui/evolution-mail-message.xml.h:100
 # ui/evolution-mail-message.xml.h:102
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
 # ui/evolution-mail-message.xml.h:56
 # ui/evolution-mail-message.xml.h:56
 # ui/evolution-mail-message.xml.h:56
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "下一个邮件"
@@ -43354,21 +43826,21 @@ msgstr "下一个邮件"
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:101
 # ui/evolution-mail-message.xml.h:103
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "普通显示(_N)"
 
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:102
 # ui/evolution-mail-message.xml.h:104
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "打开邮件(_O)"
 
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
 # ui/evolution-mail-message.xml.h:65
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "上一个邮件"
@@ -43376,32 +43848,40 @@ msgstr "上一个邮件"
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:59
 # mail/mail-config.glade.h:68
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "已引用"
 
+# ui/evolution.xml.h:46
+# ui/evolution.xml.h:46
+# ui/evolution.xml.h:46
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "重命名(_R)..."
+
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:106 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
 # ui/evolution-mail-message.xml.h:108 ui/evolution.xml.h:49
 # ui/my-evolution.xml.h:9
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "工具(_T)"
 
 # mail/folder-browser.c:1469 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1478 ui/evolution-mail-message.xml.h:107
 # mail/folder-browser.c:1479 ui/evolution-mail-message.xml.h:109
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "反删除(_U)"
 
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 # ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "关闭该窗口"
 
@@ -43418,9 +43898,9 @@ msgstr "关闭该窗口"
 # ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
 # ui/evolution.xml.h:33
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -43431,7 +43911,7 @@ msgstr "关闭(_C)"
 # ui/evolution-mail-messagedisplay.xml.h:8
 # ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -43480,94 +43960,74 @@ msgstr "格式(_M)"
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
 # ui/evolution-message-composer.xml.h:9
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
+#: ui/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "HT_ML"
 msgstr "HTML(_T)"
 
-# ui/evolution-message-composer.xml.h:10
-# ui/evolution-message-composer.xml.h:10
-# ui/evolution-message-composer.xml.h:10
-#: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "内联文本文件(_F)..."
-
-# ui/evolution-message-composer.xml.h:11
-# ui/evolution-message-composer.xml.h:11
-# ui/evolution-message-composer.xml.h:11
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "把文件作为文本插入邮件"
-
-# ui/evolution-message-composer.xml.h:12
-# ui/evolution-message-composer.xml.h:12
-# ui/evolution-message-composer.xml.h:12
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "插入文本文件..."
-
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 # ui/evolution-message-composer.xml.h:13
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:277
 # ui/evolution-message-composer.xml.h:13
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "打开"
 
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
 # ui/evolution-message-composer.xml.h:14
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "打开文件"
 
 # ui/evolution-message-composer.xml.h:15
 # ui/evolution-message-composer.xml.h:15
 # ui/evolution-message-composer.xml.h:15
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
 # ui/evolution-message-composer.xml.h:16
 # ui/evolution-message-composer.xml.h:16
 # ui/evolution-message-composer.xml.h:16
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP 签名"
 
 # ui/evolution-message-composer.xml.h:17
 # ui/evolution-message-composer.xml.h:17
 # ui/evolution-message-composer.xml.h:17
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME 加密"
 
 # ui/evolution-message-composer.xml.h:18
 # ui/evolution-message-composer.xml.h:18
 # ui/evolution-message-composer.xml.h:18
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME 签名"
 
 # ui/evolution-message-composer.xml.h:20
 # ui/evolution-message-composer.xml.h:20
 # ui/evolution-message-composer.xml.h:20
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "另存为"
 
 # ui/evolution-message-composer.xml.h:22
 # ui/evolution-message-composer.xml.h:22
 # ui/evolution-message-composer.xml.h:22
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "保存草稿(_D)"
 
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-message-composer.xml.h:23
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "保存到文件夹..."
 
@@ -43577,7 +44037,7 @@ msgstr "保存到文件夹..."
 # ui/evolution-signature-editor.xml.h:5
 # ui/evolution-message-composer.xml.h:24
 # ui/evolution-signature-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "保存当前文件"
@@ -43585,155 +44045,135 @@ msgstr "保存当前文件"
 # ui/evolution-message-composer.xml.h:25
 # ui/evolution-message-composer.xml.h:25
 # ui/evolution-message-composer.xml.h:25
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "用不同的文件名保存当前文件"
 
 # ui/evolution-message-composer.xml.h:26
 # ui/evolution-message-composer.xml.h:26
 # ui/evolution-message-composer.xml.h:26
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "在指定的文件夹中保存邮件"
 
 # ui/evolution-message-composer.xml.h:27
 # ui/evolution-message-composer.xml.h:27
 # ui/evolution-message-composer.xml.h:27
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "发送"
 
-# ui/evolution-message-composer.xml.h:28
-# ui/evolution-message-composer.xml.h:28
-# ui/evolution-message-composer.xml.h:28
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "以后发送(_L)"
-
-# ui/evolution-message-composer.xml.h:29
-# ui/evolution-message-composer.xml.h:29
-# ui/evolution-message-composer.xml.h:29
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "以后发送(_L)"
-
 # ui/evolution-message-composer.xml.h:30
 # ui/evolution-message-composer.xml.h:30
 # ui/evolution-message-composer.xml.h:30
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "以 HTML 格式发送邮件"
 
-# ui/evolution-message-composer.xml.h:31
-# ui/evolution-message-composer.xml.h:31
-# ui/evolution-message-composer.xml.h:31
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "以后再发送邮件"
-
 # ui/evolution-message-composer.xml.h:32
 # ui/evolution-message-composer.xml.h:32
 # ui/evolution-message-composer.xml.h:32
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "现在发送邮件"
 
 # ui/evolution-message-composer.xml.h:33
 # ui/evolution-message-composer.xml.h:33
 # ui/evolution-message-composer.xml.h:33
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "显示 / 隐藏附件"
 
 # ui/evolution-message-composer.xml.h:34
 # ui/evolution-message-composer.xml.h:34
 # ui/evolution-message-composer.xml.h:34
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "显示附件(_A)"
 
 # ui/evolution-message-composer.xml.h:35
 # ui/evolution-message-composer.xml.h:35
 # ui/evolution-message-composer.xml.h:35
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "显示附件"
 
 # ui/evolution-message-composer.xml.h:36
 # ui/evolution-message-composer.xml.h:36
 # ui/evolution-message-composer.xml.h:36
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该邮件"
 
 # ui/evolution-message-composer.xml.h:37
 # ui/evolution-message-composer.xml.h:37
 # ui/evolution-message-composer.xml.h:37
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该邮件"
 
 # ui/evolution-message-composer.xml.h:38
 # ui/evolution-message-composer.xml.h:38
 # ui/evolution-message-composer.xml.h:38
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "是否显示暗中转发域"
 
 # ui/evolution-message-composer.xml.h:39
 # ui/evolution-message-composer.xml.h:39
 # ui/evolution-message-composer.xml.h:39
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "是否显示转发域"
 
 # ui/evolution-message-composer.xml.h:40
 # ui/evolution-message-composer.xml.h:40
 # ui/evolution-message-composer.xml.h:40
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "是否显示发件人选择器"
 
 # ui/evolution-message-composer.xml.h:41
 # ui/evolution-message-composer.xml.h:41
 # ui/evolution-message-composer.xml.h:41
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
 # ui/evolution-message-composer.xml.h:42
 # ui/evolution-message-composer.xml.h:42
 # ui/evolution-message-composer.xml.h:42
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
 # ui/evolution-message-composer.xml.h:43
 # ui/evolution-message-composer.xml.h:43
 # ui/evolution-message-composer.xml.h:43
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "暗中转发域(_B)"
 
 # ui/evolution-message-composer.xml.h:44
 # ui/evolution-message-composer.xml.h:44
 # ui/evolution-message-composer.xml.h:44
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "转发域(_C)"
 
 # ui/evolution-message-composer.xml.h:46
 # ui/evolution-message-composer.xml.h:46
 # ui/evolution-message-composer.xml.h:46
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "全部删除(_D)"
 
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
 # ui/evolution-message-composer.xml.h:49
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "发件人域(_F)"
 
@@ -43743,32 +44183,55 @@ msgstr "发件人域(_F)"
 # ui/evolution-signature-editor.xml.h:10
 # ui/evolution-message-composer.xml.h:50
 # ui/evolution-signature-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "插入(_I)"
 
 # ui/evolution-message-composer.xml.h:51
 # ui/evolution-message-composer.xml.h:51
 # ui/evolution-message-composer.xml.h:51
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "打开(_O)..."
 
 # ui/evolution-message-composer.xml.h:52
 # ui/evolution-message-composer.xml.h:52
 # ui/evolution-message-composer.xml.h:52
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
+# ui/evolution-message-composer.xml.h:9
+# ui/evolution-message-composer.xml.h:9
+# ui/evolution-message-composer.xml.h:9
+#: ui/evolution-signature-editor.xml.h:4
+msgid "H_TML"
+msgstr "HTML(_T)"
+
+# ui/evolution-comp-editor.xml.h:15
+# ui/evolution-comp-editor.xml.h:15
+# ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "保存项并关闭对话框"
+
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
 # ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "帮助(_H)"
 
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:79
+# mail/mail-config.glade.h:88
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "签名文件："
+
 # ui/evolution-subscribe.xml.h:1
 # ui/evolution-subscribe.xml.h:1
 # ui/evolution-subscribe.xml.h:1
@@ -43932,292 +44395,341 @@ msgstr "关于 Ximian Evolution..."
 msgid "Add to _Shortcut Bar"
 msgstr "添加到快捷方式栏(_S)"
 
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+# shell/e-shell-about-box.c:40
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution "
+
 # ui/evolution.xml.h:3
 # ui/evolution.xml.h:3
 # ui/evolution.xml.h:3
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "改变该文件夹的名称"
 
 # ui/evolution.xml.h:6
 # ui/evolution.xml.h:6
 # ui/evolution.xml.h:6
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "复制该文件夹"
 
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "创建新文件夹(_N)..."
 
 # ui/evolution.xml.h:8
 # ui/evolution.xml.h:8
 # ui/evolution.xml.h:8
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "在快捷方式栏中创建到该文件夹的连接"
 
 # ui/evolution.xml.h:9
 # ui/evolution.xml.h:9
 # ui/evolution.xml.h:9
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "创建新文件夹"
 
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+# shell/e-shell-view-menu.c:545
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "创建新快捷方式"
+
+# ui/evolution.xml.h:9
+# ui/evolution.xml.h:9
+# ui/evolution.xml.h:9
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "创建新文件夹"
+
 # ui/evolution.xml.h:10
 # ui/evolution.xml.h:10
 # ui/evolution.xml.h:10
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "删除该文件夹"
 
 # ui/evolution.xml.h:11
 # ui/evolution.xml.h:11
 # ui/evolution.xml.h:11
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "显示另一个文件夹"
 
 # ui/evolution.xml.h:12
 # ui/evolution.xml.h:12
 # ui/evolution.xml.h:12
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "退出(_X)"
 
 # ui/evolution.xml.h:13
 # ui/evolution.xml.h:13
 # ui/evolution.xml.h:13
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution 窗口(_W)"
 
 # ui/evolution.xml.h:14
 # ui/evolution.xml.h:14
 # ui/evolution.xml.h:14
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "退出程序"
 
 # ui/evolution.xml.h:15
 # ui/evolution.xml.h:15
 # ui/evolution.xml.h:15
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
 # ui/evolution.xml.h:17
 # ui/evolution.xml.h:17
 # ui/evolution.xml.h:17
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "把该文件夹移到其它位置"
 
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
 # ui/evolution.xml.h:7
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "创建新文件夹(_N)..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 # ui/evolution.xml.h:18
 # ui/evolution.xml.h:18
 # ui/evolution.xml.h:18
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "在新窗口中打开"
 
 # ui/evolution.xml.h:20
 # ui/evolution.xml.h:20
 # ui/evolution.xml.h:20
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "在另一个窗口中打开该文件夹"
 
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Pilot 设置(_P)..."
+
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
 # ui/evolution-mail-global.xml.h:13
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "发送和接收"
 
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
 # ui/evolution-mail-global.xml.h:14
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "发送编队的邮件并检索新邮件"
 
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:41
+# mail/mail-config.glade.h:48
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "邮件配置"
+
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
 # ui/evolution.xml.h:21
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
 # ui/evolution.xml.h:22
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
 # ui/evolution.xml.h:24
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
 # ui/evolution.xml.h:25
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "反转"
 
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "是否显示文件夹栏"
 
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "是否显示快捷方式栏"
 
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "我们是否离线工作。"
 
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "查看选中的文件夹"
 
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution 常见问题(_F)"
 
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "关于 Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "文件夹工具栏(_F)"
 
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+# ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "文件夹(_F)"
+
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
 # ui/evolution.xml.h:39
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "转到文件夹(_G)..."
 
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
 # ui/evolution.xml.h:41
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 msgid "_Import..."
 msgstr "正在导入(_I)..."
 
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
 # ui/evolution.xml.h:42
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
 # ui/evolution.xml.h:43
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "新建(_N)"
 
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
 # ui/evolution.xml.h:44
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "新建文件夹(_N)"
 
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-# ui/evolution.xml.h:45
-#: ui/evolution.xml.h:51
-msgid "_Pilot Settings..."
-msgstr "Pilot 设置(_P)..."
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+# calendar/gui/dialogs/recurrence-page.glade.h:11
+#: ui/evolution.xml.h:56
+#, fuzzy
+msgid "_Preferences..."
+msgstr "没有循环(_N)"
 
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
 # ui/evolution.xml.h:46
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
 # ui/evolution-mail-global.xml.h:23
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "发送和接收(_S)"
 
-# ui/evolution.xml.h:47
-# ui/evolution.xml.h:47
-# ui/evolution.xml.h:47
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "快捷方式(_S)"
-
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
 # ui/evolution.xml.h:48
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "快捷方式栏(_S)"
 
+# ui/evolution.xml.h:47
+# ui/evolution.xml.h:47
+# ui/evolution.xml.h:47
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "快捷方式(_S)"
+
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
 # ui/my-evolution.xml.h:4
@@ -44239,27 +44751,62 @@ msgstr "重新载入"
 msgid "Reload the view"
 msgstr "重新载入视图"
 
-# views/addressbook/galview.xml.h:1
-# views/addressbook/galview.xml.h:1
-# views/addressbook/galview.xml.h:1
-#: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "地址卡片"
-
 # views/addressbook/galview.xml.h:2
 # views/addressbook/galview.xml.h:2
 # views/addressbook/galview.xml.h:2
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "By _Company"
 msgstr "按公司"
 
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+# views/addressbook/galview.xml.h:1
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "_Address Cards"
+msgstr "地址卡片"
+
 # views/addressbook/galview.xml.h:3
 # views/addressbook/galview.xml.h:3
 # views/addressbook/galview.xml.h:3
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "电话列表"
 
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+# calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "周视图"
+
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+# calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "日视图"
+
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+# calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "月视图"
+
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+# calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "周工作视图"
+
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:837
 # mail/mail-account-gui.c:834
@@ -44303,15 +44850,24 @@ msgstr "邮件"
 # views/tasks/galview.xml.h:2
 # views/tasks/galview.xml.h:2
 # views/tasks/galview.xml.h:2
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "按类别"
 
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:18
+# ui/evolution-tasks.xml.h:22
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "任务(_T)"
+
 # widgets/e-timezone-dialog/e-timezone-dialog.c:207
 # widgets/e-timezone-dialog/e-timezone-dialog.c:700
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -44563,14 +45119,14 @@ msgstr "..."
 # widgets/misc/e-filter-bar.c:152
 # widgets/misc/e-filter-bar.c:153
 # widgets/misc/e-filter-bar.c:153
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
 # widgets/misc/e-filter-bar.c:168
 # widgets/misc/e-filter-bar.c:169
 # widgets/misc/e-filter-bar.c:169
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "保存搜索"
 
@@ -44642,7 +45198,7 @@ msgstr "不再显示该邮件。"
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "立即查找"
@@ -44651,7 +45207,7 @@ msgstr "立即查找"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "清除"
@@ -44660,14 +45216,14 @@ msgstr "清除"
 # shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
 # widgets/misc/e-filter-bar.h:95
 # widgets/misc/e-filter-bar.h:95
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "清除"
 
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
 # widgets/misc/e-search-bar.c:460
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "立即查找"
 
@@ -44696,24 +45252,281 @@ msgstr "个人日历服务器；日历工厂"
 # wombat/wombat.c:200
 # wombat/wombat.c:200
 # wombat/wombat.c:200
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs()： 无法初始化 GNOME-VFS"
 
 # wombat/wombat.c:212
 # wombat/wombat.c:212
 # wombat/wombat.c:212
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba()： 无法初始化 GNOME"
 
 # wombat/wombat.c:225
 # wombat/wombat.c:225
 # wombat/wombat.c:225
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()： 无法初始化 Bonobo"
 
+# addressbook/gui/component/select-names/e-select-names.c:524
+# addressbook/gui/component/select-names/e-select-names.c:524
+# addressbook/gui/component/select-names/e-select-names.c:581
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "This may have been caused by the evolution-addressbook component "
+#~ "crashing.\n"
+#~ "To help us better understand and ultimately resolve this problem,\n"
+#~ "please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+#~ "detailed description of the circumstances under which this error\n"
+#~ "occurred.  Thank you."
+#~ msgstr ""
+#~ "Evolution 无法获取本地地址簿空间。\n"
+#~ "这可能是由 evolution 的地址簿组件崩溃导致的。\n"
+#~ "为了帮助我们更好地理解并最终解决该问题，\n"
+#~ "请把对产生该错误环境的详细情况作为电子邮件发送给\n"
+#~ " Jon Trowbridge <trow@ximian.com>。\n"
+#~ "谢谢。"
+
+# addressbook/gui/component/select-names/e-select-names.c:532
+# addressbook/gui/component/select-names/e-select-names.c:532
+# addressbook/gui/component/select-names/e-select-names.c:589
+#~ msgid ""
+#~ "Evolution is unable to get the addressbook local storage.\n"
+#~ "Under normal circumstances, this should never happen.\n"
+#~ "You may need to exit and restart Evolution in order to\n"
+#~ "correct this problem."
+#~ msgstr ""
+#~ "Evolution 无法获得地址簿本地存储。\n"
+#~ "在普通环境下，这不会发生。\n"
+#~ "您可能需要退出并重新启动 Evolution 以便\n"
+#~ "改正这一问题。"
+
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+# ui/evolution.xml.h:42
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "移动(_M)..."
+
+# calendar/gui/dialogs/cancel-comp.c:51
+# calendar/gui/dialogs/cancel-comp.c:51
+# calendar/gui/dialogs/cancel-comp.c:51
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "会见状态已经改变。发送更新后的版本？"
+
+# calendar/gui/e-day-view.c:3546 calendar/gui/e-week-view.c:3424
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3430
+# calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3434
+#~ msgid "_Delete this Appointment"
+#~ msgstr "删除该约会(_D)"
+
+# camel/camel-tcp-stream-openssl.c:519
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "提交者：%s\n"
+#~ "主题：%s"
+
+#~ msgid "SASL Protocol error"
+#~ msgstr "SASL 协议错误"
+
+# shell/e-storage.c:506
+# shell/e-storage.c:506
+# shell/e-storage.c:506
+#~ msgid "I/O Error: %s"
+#~ msgstr "输入输出错误：%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:317
+# camel/providers/smtp/camel-smtp-transport.c:317
+# camel/providers/smtp/camel-smtp-transport.c:320
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "Welcome 应答错误： %s： 可能不致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:706
+# camel/providers/smtp/camel-smtp-transport.c:706
+# camel/providers/smtp/camel-smtp-transport.c:820
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELLO 请求超时： %s： 非致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:726
+# camel/providers/smtp/camel-smtp-transport.c:726
+# camel/providers/smtp/camel-smtp-transport.c:840
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "HELLO 应答错误： %s： 非致命"
+
+# camel/providers/smtp/camel-smtp-transport.c:1133
+# camel/providers/smtp/camel-smtp-transport.c:1133
+# camel/providers/smtp/camel-smtp-transport.c:1236
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT 请求超时： %s： 非致命"
+
+# composer/e-msg-composer.c:1584
+# composer/e-msg-composer.c:1501
+# composer/e-msg-composer.c:1467
+#~ msgid "Insert File"
+#~ msgstr "插入文件"
+
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "您选择了无效的日期。"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "邮件的日期将与过滤规则运行的\n"
+#~ "日期或者虚拟文件夹打开的\n"
+#~ "日期进行比较。"
+
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+# addressbook/backend/ebook/e-card-simple.c:67
+# addressbook/gui/contact-editor/e-contact-editor.c:1650
+#, fuzzy
+#~ msgid "Command"
+#~ msgstr "公司"
+
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+# mail/mail-account-editor-news.c:160
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution 新闻编辑器"
+
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+# mail/mail-accounts.c:532 mail/mail-accounts.c:536
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "您确信您要删除该邮件帐号？"
+
+# mail/mail-callbacks.c:600
+# mail/mail-callbacks.c:600
+# mail/mail-callbacks.c:549
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "在您能够发送该邮件之前您必须配置一个帐号。"
+
+# mail/mail-config.glade.h:45
+# mail/mail-config.glade.h:45
+# mail/mail-config.glade.h:52
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP 服务器："
+
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+# my-evolution/my-evolution.glade.h:28
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "新闻来源(_N)"
+
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:80
+# mail/mail-config.glade.h:89
+#~ msgid "Source"
+#~ msgstr "来源"
+
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:81
+# mail/mail-config.glade.h:90
+#~ msgid "Source Information"
+#~ msgstr "来源信息"
+
+# mail/mail-config.glade.h:121
+# mail/mail-config.glade.h:121
+# mail/mail-config.glade.h:130
+#~ msgid "newswindow1"
+#~ msgstr "新闻窗口1"
+
+# mail/mail-display.c:350
+# mail/mail-display.c:349
+# mail/mail-display.c:350
+#~ msgid "Save to Disk..."
+#~ msgstr "保存到磁盘..."
+
+# mail/mail-callbacks.c:1962
+# mail/mail-callbacks.c:2081
+# mail/mail-callbacks.c:2117
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "消息另存为..."
+
+# mail/mail-ops.c:2233
+#~ msgid "Executing shell command: %s"
+#~ msgstr "正在执行 shell 命令：%s"
+
+# shell/e-shell-folder-creation-dialog.c:267
+# shell/e-shell-folder-creation-dialog.c:267
+# shell/e-shell-folder-creation-dialog.c:304
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - 创建新文件夹"
+
+# shell/e-shell-folder-selection-dialog.c:98
+# shell/e-shell-folder-selection-dialog.c:98
+# shell/e-shell-folder-selection-dialog.c:98
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "文件夹的类型对于请求的\n"
+#~ "操作来说是不合法的。"
+
+# shell/e-shell-importer.c:409
+# shell/e-shell-importer.c:409
+# shell/e-shell-importer.c:420
+#~ msgid "You may only import to local folders"
+#~ msgstr "您只能导入到本地文件夹"
+
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:32
+# ui/evolution-addressbook.xml.h:33
+#~ msgid "_Contact List"
+#~ msgstr "联系人列表(_C)"
+
+# ui/evolution-message-composer.xml.h:10
+# ui/evolution-message-composer.xml.h:10
+# ui/evolution-message-composer.xml.h:10
+#~ msgid "Inline Text _File..."
+#~ msgstr "内联文本文件(_F)..."
+
+# ui/evolution-message-composer.xml.h:11
+# ui/evolution-message-composer.xml.h:11
+# ui/evolution-message-composer.xml.h:11
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "把文件作为文本插入邮件"
+
+# ui/evolution-message-composer.xml.h:12
+# ui/evolution-message-composer.xml.h:12
+# ui/evolution-message-composer.xml.h:12
+#~ msgid "Insert text file..."
+#~ msgstr "插入文本文件..."
+
+# ui/evolution-message-composer.xml.h:28
+# ui/evolution-message-composer.xml.h:28
+# ui/evolution-message-composer.xml.h:28
+#~ msgid "Send _Later"
+#~ msgstr "以后发送(_L)"
+
+# ui/evolution-message-composer.xml.h:29
+# ui/evolution-message-composer.xml.h:29
+# ui/evolution-message-composer.xml.h:29
+#~ msgid "Send _later"
+#~ msgstr "以后发送(_L)"
+
+# ui/evolution-message-composer.xml.h:31
+# ui/evolution-message-composer.xml.h:31
+# ui/evolution-message-composer.xml.h:31
+#~ msgid "Send the message later"
+#~ msgstr "以后再发送邮件"
+
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+# ui/evolution.xml.h:45
+#~ msgid "_Pilot Settings..."
+#~ msgstr "Pilot 设置(_P)..."
+
 # addressbook/backend/pas/pas-backend-ldap.c:483
 # addressbook/backend/pas/pas-backend-ldap.c:483
 # addressbook/backend/pas/pas-backend-ldap.c:486
@@ -44868,21 +45681,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "日历概要组件车间。"
 
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-# calendar/gui/component-factory.c:642 ui/evolution-calendar.xml.h:7
-#~ msgid "Create a new appointment"
-#~ msgstr "创建新约会"
-
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:5
-# calendar/gui/component-factory.c:648 ui/evolution-calendar.xml.h:8
-# ui/evolution-tasks.xml.h:6
-#~ msgid "Create a new task"
-#~ msgstr "创建新任务"
-
 # calendar/gui/component-factory.c:649
 # calendar/gui/component-factory.c:649
 # calendar/gui/component-factory.c:649
@@ -45385,12 +46183,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "邮件存储文件夹 (内部)"
 
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-# mail/component-factory.c:129
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "无法连接到存储： %s"
-
 # mail/component-factory.c:951
 # mail/component-factory.c:951
 # mail/component-factory.c:955
@@ -45531,12 +46323,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "组织(_O)："
 
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:113
-# mail/mail-config.glade.h:122
-#~ msgid "_Remember this password"
-#~ msgstr "记住该密码(_R)"
-
 # mail/mail-config.glade.h:114
 # mail/mail-config.glade.h:114
 # mail/mail-config.glade.h:123
@@ -45739,12 +46525,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ msgid "Create or edit mail accounts and other preferences"
 #~ msgstr "创建或编辑邮件帐号和其它属性"
 
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-# ui/evolution-mail-global.xml.h:10
-#~ msgid "New Message"
-#~ msgstr "新建邮件"
-
 # ui/evolution-mail-global.xml.h:21
 # ui/evolution-mail-global.xml.h:21
 # ui/evolution-mail-global.xml.h:21
@@ -46185,12 +46965,6 @@ msgstr "init_bonobo()： 无法初始化 Bonobo"
 #~ "it."
 #~ msgstr "这将连接到 POP 服务器并使用 Kerberos 4 进行认证。"
 
-# camel/providers/pop3/camel-pop3-store.c:198
-# camel/providers/pop3/camel-pop3-store.c:198
-# camel/providers/pop3/camel-pop3-store.c:198
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "无法认证到 KPOP 服务器： %s"
-
 # camel/providers/pop3/camel-pop3-store.c:214
 # camel/providers/pop3/camel-pop3-store.c:214
 # camel/providers/pop3/camel-pop3-store.c:214
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e078084f33..8e6ff5b7c7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.16.99\n"
-"POT-Creation-Date: 2002-06-27 14:13-0400\n"
+"POT-Creation-Date: 2002-08-13 08:06-0400\n"
 "PO-Revision-Date: 2001-09-10 09:55+0800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -43,7 +43,7 @@ msgid "File As"
 msgstr "�k�ɬ�"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:76
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "�W��"
@@ -432,22 +432,22 @@ msgstr "�����l�� Bonobo"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2735
+#: addressbook/backend/pas/pas-backend-file.c:356
+#: addressbook/backend/pas/pas-backend-ldap.c:2747
 #, fuzzy
 msgid "Searching..."
 msgstr "�M��"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: addressbook/backend/pas/pas-backend-file.c:263
+#: addressbook/backend/pas/pas-backend-file.c:358
 #, fuzzy
 msgid "Loading..."
 msgstr "���b����..."
 
 # camel/camel-folder-search.c:338
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
+#: addressbook/backend/pas/pas-backend-file.c:381
 #, fuzzy
 msgid "Error in search expression."
 msgstr ""
@@ -456,38 +456,38 @@ msgstr ""
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: addressbook/backend/pas/pas-backend-ldap.c:1126
+#: addressbook/backend/pas/pas-backend-ldap.c:1138
 #, fuzzy
 msgid "Adding card to LDAP server..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: addressbook/backend/pas/pas-backend-ldap.c:1229
+#: addressbook/backend/pas/pas-backend-ldap.c:1241
 #, fuzzy
 msgid "Removing card from LDAP server..."
 msgstr "�����W��..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1465
+#: addressbook/backend/pas/pas-backend-ldap.c:1477
 msgid "Modifying card from LDAP server..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2589
+#: addressbook/backend/pas/pas-backend-ldap.c:2601
 msgid "Restarting search."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2681
+#: addressbook/backend/pas/pas-backend-ldap.c:2693
 msgid "Receiving LDAP search results..."
 msgstr ""
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/backend/pas/pas-backend-ldap.c:2762
+#: addressbook/backend/pas/pas-backend-ldap.c:2774
 #, fuzzy
 msgid "Error performing search"
 msgstr "�����W���ɵo�Ϳ��~"
 
 # camel/camel-url.c:289
-#: addressbook/backend/pas/pas-backend-ldap.c:2786
+#: addressbook/backend/pas/pas-backend-ldap.c:2798
 #, fuzzy
 msgid "Could not parse query string"
 msgstr "������R URL `%s'"
@@ -601,11 +601,11 @@ msgstr ""
 
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:620
+#: addressbook/gui/component/addressbook-component.c:608
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1867 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1042
+#: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1067
 msgid "Contacts"
 msgstr "�s���H"
 
@@ -626,27 +626,38 @@ msgstr "NNTP ���A���G"
 msgid "LDAP server containing contact information"
 msgstr "��Ƨ��]�t�s���H��T"
 
+# ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "New Contact"
+msgstr "�s�W�s���H"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/addressbook-component.c:564
+msgid "_Contact"
+msgstr "�s���H(_C)"
+
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/component/addressbook-component.c:565
+#, fuzzy
+msgid "Create a new contact"
+msgstr "�s�W�s���H"
+
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "�s�W�s���H�M��"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:578
+#: addressbook/gui/component/addressbook-component.c:568
 #, fuzzy
 msgid "Contact _List"
 msgstr "�s���H�M��(_C)"
 
-# ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/component/addressbook-component.c:581
-msgid "New Contact"
-msgstr "�s�W�s���H"
-
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/addressbook-component.c:581
-#: ui/evolution-addressbook.xml.h:32
-msgid "_Contact"
-msgstr "�s���H(_C)"
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/component/addressbook-component.c:569
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "�s�W�s���H�M��"
 
 # camel/providers/imap/camel-imap-store.c:531
 #: addressbook/gui/component/addressbook-config.c:197
@@ -674,12 +685,12 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1152
+#: addressbook/gui/component/addressbook-config.c:1150
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
 # mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1174
+#: addressbook/gui/component/addressbook-config.c:1172
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
@@ -687,12 +698,12 @@ msgstr ""
 "%s"
 
 # camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1182
+#: addressbook/gui/component/addressbook-config.c:1180
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP ���A�����^���S���]�t %s ��T"
 
-#: addressbook/gui/component/addressbook-config.c:1638
+#: addressbook/gui/component/addressbook-config.c:1636
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(���@������ evolution �ä��䴩 SSL)"
@@ -708,7 +719,7 @@ msgstr "(���@������ evolution �ä��䴩 SSL)"
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:139
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "����l��� gnome-vfs"
 
@@ -719,12 +730,12 @@ msgid "Other Contacts"
 msgstr "�s���H"
 
 # addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/component/addressbook.c:516
+#: addressbook/gui/component/addressbook.c:468
 msgid "Unable to open addressbook"
 msgstr "����}�ҥؿ��A��"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:477
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -735,7 +746,7 @@ msgstr ""
 "�Ϊ� LDAP ���A���S���Ұ�"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:482
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -747,7 +758,7 @@ msgstr ""
 "�Φw�� OpenLDAP�A�M��A���s�sĶ Evolution�C\n"
 
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/component/addressbook.c:538
+#: addressbook/gui/component/addressbook.c:490
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -756,26 +767,26 @@ msgstr ""
 "�z�O�_�֦��s���v���C"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:648
-#: addressbook/gui/component/addressbook.c:651
+#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:603
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "�п�J %s �Ҷ����K�X"
 
-#: addressbook/gui/component/addressbook.c:776
+#: addressbook/gui/component/addressbook.c:728
 #, fuzzy
 msgid "Name begins with"
 msgstr "�H���׵�"
 
 # addressbook/contact-editor/e-contact-editor.c:1285
 # addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/component/addressbook.c:777
+#: addressbook/gui/component/addressbook.c:729
 #, fuzzy
 msgid "Email is"
 msgstr "�q�l�l�� 2"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/component/addressbook.c:778
+#: addressbook/gui/component/addressbook.c:730
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "���O��"
@@ -783,26 +794,26 @@ msgstr "���O��"
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:779
+#: addressbook/gui/component/addressbook.c:731
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "�������]�t"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/component/addressbook.c:780
+#: addressbook/gui/component/addressbook.c:732
 msgid "Advanced..."
 msgstr "�i��..."
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1008
+#: addressbook/gui/component/addressbook.c:960
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "�������O"
 
 # addressbook/gui/component/addressbook.c:763
-#: addressbook/gui/component/addressbook.c:1090
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "��Ƨ��s������ܤ�URI"
 
@@ -948,7 +959,7 @@ msgid "Addressbook Sources"
 msgstr "�ؿ��A�Ȩӷ�"
 
 # calendar/gui/e-calendar-table.c:162
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:57
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
 #: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Always"
@@ -1068,8 +1079,8 @@ msgid "Mappings"
 msgstr "���"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:59
-#: mail/mail-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Never"
 msgstr "�C"
@@ -1125,8 +1136,8 @@ msgstr "�M��d��(_C)�G"
 # mail/mail-search.c:242
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1701
-#: calendar/gui/e-week-view.c:1213
+#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
+#: calendar/gui/e-week-view.c:1214
 #, fuzzy
 msgid "Searching"
 msgstr "�M��"
@@ -1322,7 +1333,7 @@ msgid "Using email address"
 msgstr "�o�O�l�H�a�} (_T)"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:58 mail/mail-config.glade.h:138
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1331,8 +1342,8 @@ msgstr ""
 #: addressbook/gui/component/ldap-config.glade.h:104
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:141
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "�s�W (_A)"
 
@@ -1396,12 +1407,12 @@ msgstr ""
 # 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:114 filter/filter.glade.h:9
-#: mail/mail-config.glade.h:156 ui/evolution-addressbook.xml.h:36
+#: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
+#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "�s�� (_E)"
@@ -1542,10 +1553,10 @@ msgstr "�ؿ��A�ȦW�ٿ�ܤ����u�t"
 # shell/e-shortcuts-view.c:388
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:980
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 my-evolution/e-summary-shown.c:552
-#: shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names.c:677
+#: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
+#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
+#: shell/e-shortcuts-view.c:178
 msgid "Remove"
 msgstr "����"
 
@@ -1581,34 +1592,16 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr "���R�W���s���H"
 
+#: addressbook/gui/component/select-names/e-select-names.c:511
+msgid "Select Contacts from Addressbook"
+msgstr "�q�ؿ��A�ȿ�ܳs���H"
+
 # addressbook/gui/component/addressbook.c:619
-#: addressbook/gui/component/select-names/e-select-names.c:600
+#: addressbook/gui/component/select-names/e-select-names.c:544
 #, fuzzy
 msgid "Find contact in"
 msgstr "�H��̥]�t"
 
-#: addressbook/gui/component/select-names/e-select-names.c:716
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:724
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:806
-msgid "Select Contacts from Addressbook"
-msgstr "�q�ؿ��A�ȿ�ܳs���H"
-
 # addressbook/gui/component/select-names/select-names.glade.h:3
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Select Names"
@@ -1632,20 +1625,14 @@ msgid ""
 "select one from the list below:"
 msgstr ""
 
-# ui/evolution.xml.h:57
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "_Browse..."
-msgstr "����(_M)..."
-
 # calendar/gui/e-tasks.c:155
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "_Category:"
 msgstr "���O (_C)�G"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "_Folder:"
 msgstr "��Ƨ� (_F)�G"
 
@@ -1789,11 +1776,12 @@ msgstr "���\���� HTML �榡���q�l�l��"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1003 calendar/gui/e-day-view.c:3612
-#: filter/filter.glade.h:8 mail/folder-browser.c:1703
-#: mail/mail-config.glade.h:154 ui/evolution-calendar.xml.h:27
-#: ui/evolution-mail-message.xml.h:95 ui/evolution-tasks.xml.h:16
-#: ui/evolution.xml.h:41
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
+#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
+#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "�R�� (_D)"
 
@@ -3190,7 +3178,7 @@ msgstr "���ǰe�q�l�l��ܦ��M������è�a�}(_H)"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "���� (_R)"
 
@@ -3265,7 +3253,7 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:152
 msgid "Advanced Search"
 msgstr "�i���M��"
 
@@ -3303,13 +3291,13 @@ msgstr "�Ұ� %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 #: addressbook/gui/widgets/e-minicard.c:475
 msgid "Error modifying card"
 msgstr "�s��W���ɵo�Ϳ��~"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1079
+#: shell/evolution-shell-component.c:1090
 msgid "Success"
 msgstr "���\"
 
@@ -3318,8 +3306,8 @@ msgstr "���\"
 #: addressbook/gui/widgets/e-addressbook-util.c:36
 #: camel/providers/imap/camel-imap-command.c:305
 #: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:508 shell/e-shell.c:2164
-#: shell/e-storage.c:515 shell/evolution-shell-component.c:1118
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
 msgid "Unknown error"
 msgstr "���������~"
 
@@ -3330,8 +3318,8 @@ msgid "Repository offline"
 msgstr "��Ʈw���u"
 
 # shell/e-storage.c:475
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:503
-#: shell/evolution-shell-component.c:1109
+#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
+#: shell/evolution-shell-component.c:1120
 msgid "Permission denied"
 msgstr "�v������"
 
@@ -3356,7 +3344,7 @@ msgstr "�q�T��w���䴩"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -3381,60 +3369,68 @@ msgstr "�n�D����"
 msgid "TLS not Available"
 msgstr ""
 
-# shell/e-storage.c:467
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
 #: addressbook/gui/widgets/e-addressbook-util.c:46
+#, fuzzy
+msgid "Addressbook does not exist"
+msgstr "�ɮ� %s ���s�b"
+
+# shell/e-storage.c:467
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Other error"
 msgstr "�䥦���~"
 
 # calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/e-addressbook-util.c:62
+#: addressbook/gui/widgets/e-addressbook-util.c:63
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "�z�O�_���n�x�s�H"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:81
+#: addressbook/gui/widgets/e-addressbook-util.c:82
 msgid "Error adding list"
 msgstr "�s�W�M��ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:81
-#: addressbook/gui/widgets/e-addressbook-util.c:291
+#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:292
 msgid "Error adding card"
 msgstr "�s�W�W���ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/e-addressbook-util.c:90
+#: addressbook/gui/widgets/e-addressbook-util.c:91
 msgid "Error modifying list"
 msgstr "�s��M��ɵo�Ϳ��~"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:100
+#: addressbook/gui/widgets/e-addressbook-util.c:101
 msgid "Error removing list"
 msgstr "�����M��ɵo�Ϳ��~"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/e-addressbook-util.c:100
-#: addressbook/gui/widgets/e-addressbook-util.c:249
+#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:250
 #: addressbook/gui/widgets/e-addressbook-view.c:1624
 msgid "Error removing card"
 msgstr "�����W���ɵo�Ϳ��~"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/widgets/e-addressbook-util.c:207
+#: addressbook/gui/widgets/e-addressbook-util.c:208
 #, fuzzy
 msgid "Display Cards?"
 msgstr "���"
 
 # calendar/gui/calendar-summary.c:622
 # mail/mail-config.glade.h:24
-#: addressbook/gui/widgets/e-addressbook-util.c:208
+#: addressbook/gui/widgets/e-addressbook-util.c:209
 #, fuzzy
 msgid "Display Cards"
 msgstr "���"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:212
+#: addressbook/gui/widgets/e-addressbook-util.c:213
 #, c-format
 msgid ""
 "You have requested that %d cards be cards. This will cause %d new windows to "
@@ -3443,13 +3439,13 @@ msgid ""
 msgstr ""
 
 # mail/mail-callbacks.c:850
-#: addressbook/gui/widgets/e-addressbook-util.c:347
+#: addressbook/gui/widgets/e-addressbook-util.c:348
 #, fuzzy
 msgid "Move card to"
 msgstr "�N�l�󲾦�"
 
 # calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/e-addressbook-util.c:349
+#: addressbook/gui/widgets/e-addressbook-util.c:350
 #, fuzzy
 msgid "Copy card to"
 msgstr "�ƻs��w���u�@"
@@ -3458,7 +3454,7 @@ msgstr "�ƻs��w���u�@"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:352
+#: addressbook/gui/widgets/e-addressbook-util.c:353
 #, fuzzy
 msgid "Move cards to"
 msgstr "�S���W��"
@@ -3467,7 +3463,7 @@ msgstr "�S���W��"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/e-addressbook-util.c:354
+#: addressbook/gui/widgets/e-addressbook-util.c:355
 #, fuzzy
 msgid "Copy cards to"
 msgstr "�S���W��"
@@ -3560,7 +3556,7 @@ msgstr "�ؿ��A��"
 #: addressbook/gui/widgets/e-addressbook-view.c:701
 #: addressbook/gui/widgets/e-addressbook-view.c:890
 #: addressbook/gui/widgets/e-addressbook-view.c:1826
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "�x�s�� VCard �ɮ׮榡"
 
@@ -3608,7 +3604,7 @@ msgstr "�l��]�w(_M)..."
 
 # ui/evolution-mail.xml.h:35
 #: addressbook/gui/widgets/e-addressbook-view.c:891
-#: ui/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "�s���H��H"
 
@@ -3626,8 +3622,8 @@ msgstr "�ǰe�l�󵹳s���H"
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
 #: addressbook/gui/widgets/e-addressbook-view.c:893
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:65
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "�C�L"
@@ -3653,7 +3649,7 @@ msgstr "���ܸ�Ƨ�(_M)..."
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
 #: addressbook/gui/widgets/e-addressbook-view.c:903
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:4
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "�ŤU"
 
@@ -3669,7 +3665,7 @@ msgstr "�ƻs"
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
 #: addressbook/gui/widgets/e-addressbook-view.c:905
-#: ui/evolution-addressbook.xml.h:15 ui/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "�K�W"
 
@@ -3684,9 +3680,9 @@ msgstr "�K�W"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:12
-#: mail/mail-accounts.c:218 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
@@ -3694,7 +3690,7 @@ msgstr "�R��"
 
 # widgets/menus/gal-view-menus.c:176
 #: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3570 calendar/gui/e-week-view.c:3453
+#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
 #, fuzzy
 msgid "Current View"
 msgstr "�ثe�˵�(_C)"
@@ -3895,7 +3891,7 @@ msgid "Number of columns:"
 msgstr "��ơG"
 
 # addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:83
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
 msgid "Options"
 msgstr "�ﶵ"
 
@@ -4011,7 +4007,7 @@ msgstr "�s����|(_E)"
 # mail/message-list.c:689
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:732
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
 msgid "High"
 msgstr "��"
 
@@ -4022,9 +4018,9 @@ msgstr "��"
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:731
+#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
 msgid "Normal"
 msgstr "���q"
 
@@ -4035,7 +4031,7 @@ msgstr "���q"
 # mail/message-list.c:687
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:730
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
 msgid "Low"
 msgstr "�C"
 
@@ -4044,7 +4040,7 @@ msgstr "�C"
 # calendar/gui/e-calendar-table.c:348
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 #: calendar/gui/e-calendar-table.c:421
 msgid "Undefined"
 msgstr "�����w"
@@ -4209,11 +4205,11 @@ msgid "_Edit appointment"
 msgstr "�s����|(_E)"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:675
+#: calendar/gui/alarm-notify/alarm-queue.c:676
 msgid "No description available."
 msgstr "�S���y�z�C"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#: calendar/gui/alarm-notify/alarm-queue.c:736
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4222,13 +4218,13 @@ msgid ""
 msgstr ""
 
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2658
+#: calendar/gui/alarm-notify/alarm-queue.c:754
+#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "ĵ�i"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
+#: calendar/gui/alarm-notify/alarm-queue.c:759
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4242,7 +4238,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/alarm-notify/alarm-queue.c:772
+#: calendar/gui/alarm-notify/alarm-queue.c:773
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "���n�A��ܳo�ӰT���C"
@@ -4279,7 +4275,7 @@ msgstr "�y�z�]�t"
 msgid "Comment contains"
 msgstr "�Ƶ��]�t"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1089
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
 msgid "Unmatched"
 msgstr "�S���۲Ÿ��"
 
@@ -4296,7 +4292,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:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1427 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4324,7 +4320,7 @@ msgid "%d %B"
 msgstr "%d %B"
 
 # calendar/gui/calendar-commands.c:468
-#: calendar/gui/calendar-commands.c:800
+#: calendar/gui/calendar-commands.c:797
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr "����إߦ�ƾ��˵��C  ���ˬd ORBit �M OAF ���]�w�C"
@@ -4332,7 +4328,7 @@ msgstr "����إߦ�ƾ��˵��C  ���ˬd ORBit �M OAF ���]�w�C"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
+#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:977
 #: calendar/gui/e-calendar-table.c:397
 msgid "Private"
 msgstr "�p�H"
@@ -4340,7 +4336,7 @@ msgstr "�p�H"
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:979
 #: calendar/gui/e-calendar-table.c:398
 msgid "Confidential"
 msgstr "���K"
@@ -4373,7 +4369,7 @@ msgid "W"
 msgstr "W"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "�Ŷ�"
@@ -4381,7 +4377,7 @@ msgstr "�Ŷ�"
 # widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1103
+#: shell/evolution-shell-component.c:1114
 msgid "Busy"
 msgstr "���L"
 
@@ -4389,8 +4385,8 @@ msgstr "���L"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "���}�l"
@@ -4399,7 +4395,7 @@ msgstr "���}�l"
 # calendar/gui/calendar-model.c:1178
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
@@ -4409,7 +4405,7 @@ msgstr "�i�椤"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
@@ -4417,7 +4413,7 @@ msgid "Completed"
 msgstr "�w����"
 
 # calendar/gui/calendar-model.c:970
-#: calendar/gui/calendar-model.c:1052
+#: calendar/gui/calendar-model.c:1041
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4442,66 +4438,65 @@ msgstr ""
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1918
-#: mail/folder-browser.c:1665 mail/mail-account-gui.c:1210
-#: mail/mail-account-gui.c:1622 mail/mail-accounts.c:445
-#: mail/mail-accounts.c:454 mail/mail-accounts.c:509
-#: mail/mail-config.glade.h:80 mail/message-tag-followup.c:67
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
+#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
 #: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
 msgid "None"
 msgstr "�L"
 
 # calendar/gui/calendar-model.c:1576
-#: calendar/gui/calendar-model.c:1713
+#: calendar/gui/calendar-model.c:1709
 msgid "Recurring"
 msgstr "�`���Ҧ�"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/calendar-model.c:1715
+#: calendar/gui/calendar-model.c:1711
 msgid "Assigned"
 msgstr "�w���w"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
 #: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:850
 msgid "Yes"
 msgstr "�O"
 
 # calendar/gui/calendar-model.c:1584
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:851
 msgid "No"
 msgstr "�_"
 
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
+#: calendar/gui/calendar-view-factory.c:148
 msgid "Day View"
 msgstr "���˵�"
 
 # ui/evolution-calendar.xml.h:35
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
+#: calendar/gui/calendar-view-factory.c:151
 msgid "Work Week View"
 msgstr "�u�@�g�˵�"
 
 # widgets/menus/gal-view-menus.c:202
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
+#: calendar/gui/calendar-view-factory.c:154
 msgid "Week View"
 msgstr "�g�˵�"
 
 # ui/evolution-calendar.xml.h:15
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
+#: calendar/gui/calendar-view-factory.c:157
 msgid "Month View"
 msgstr "���˵�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
-#: importers/netscape-importer.c:1866 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1036
+#: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
+#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
 msgstr "��ƾ�"
 
@@ -4512,12 +4507,12 @@ msgstr "��Ƨ��]�t���|�P�ƥ�"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:741
+#: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
 #: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
-#: calendar/importers/icalendar-importer.c:645
-#: importers/netscape-importer.c:1868 my-evolution/e-summary-tasks.c:250
-#: my-evolution/e-summary-tasks.c:267 shell/e-local-storage.c:178
-#: shell/e-shortcuts.c:1039 views/tasks/galview.xml.h:1
+#: calendar/importers/icalendar-importer.c:703
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
+#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "�u�@"
 
@@ -4526,57 +4521,79 @@ msgstr "�u�@"
 msgid "Folder containing to-do items"
 msgstr "��Ƨ��]�t�ݿ�ƶ�"
 
+# calendar/gui/e-day-view.c:3146
+# ui/evolution-calendar.xml.h:16
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "New appointment"
+msgstr "�s�W���|"
+
+# calendar/gui/event-editor-dialog.glade.h:3
+#: calendar/gui/component-factory.c:708
+#, fuzzy
+msgid "_Appointment"
+msgstr "���|"
+
+# ui/evolution-calendar.xml.h:5
+#: calendar/gui/component-factory.c:709
+msgid "Create a new appointment"
+msgstr "�إߤ@�ӷs�����|"
+
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "New meeting"
 msgstr "�s�D�o�e���A���]�w"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/component-factory.c:704
+#: calendar/gui/component-factory.c:713
 #, fuzzy
 msgid "_Meeting"
 msgstr "�|ij"
 
+# ui/evolution-tasks.xml.h:2
+#: calendar/gui/component-factory.c:714
+#, fuzzy
+msgid "Create a new meeting request"
+msgstr "�إߤ@�ӷs���u�@"
+
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 #, fuzzy
 msgid "New task"
 msgstr "�s�W�u�@"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:718
 msgid "_Task"
 msgstr "�u�@(_T)"
 
+# ui/evolution-tasks.xml.h:2
+#: calendar/gui/component-factory.c:719
+msgid "Create a new task"
+msgstr "�إߤ@�ӷs���u�@"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "�s�W���|"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:712
+#: calendar/gui/component-factory.c:723
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "�s�W���|(_A)"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
-#: calendar/gui/component-factory.c:716
-#, fuzzy
-msgid "New appointment"
-msgstr "�s�W���|"
-
-# calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/component-factory.c:716
+# ui/evolution-calendar.xml.h:5
+#: calendar/gui/component-factory.c:724
 #, fuzzy
-msgid "_Appointment"
-msgstr "���|"
+msgid "Create a new all-day appointment"
+msgstr "�إߤ@�ӷs�����|"
 
 # calendar/gui/gnome-cal.c:840
 #: calendar/gui/control-factory.c:123
@@ -4652,7 +4669,8 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "�㦳�o�ǰѼơG"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: filter/filter.glade.h:20
 msgid "days"
 msgstr "��"
 
@@ -4660,12 +4678,14 @@ msgstr "��"
 msgid "extra times every"
 msgstr "�������j�C"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: filter/filter.glade.h:21
 msgid "hours"
 msgstr "��"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "��"
 
@@ -4821,7 +4841,7 @@ msgstr "����"
 # calendar/gui/e-itip-control.glade.h:11
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "�K�n�G"
 
@@ -4858,7 +4878,7 @@ msgstr "��"
 
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:188
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
 msgid "minute(s)"
 msgstr "��"
 
@@ -5080,7 +5100,7 @@ msgstr "�g��(_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:40
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:157
 msgid "_General"
 msgstr "�@��(_G)"
 
@@ -5134,23 +5154,37 @@ msgstr "�g�T(_W)"
 msgid "before every appointment"
 msgstr "���|�����e"
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
-msgstr "�|ij���p�w�ܧ�C�O�_�ǰe��s�L����T�H"
+#: calendar/gui/dialogs/cancel-comp.c:56
+msgid ""
+"The event being deleted is a meeting, would you like to send a cancellation "
+"notice?"
+msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: calendar/gui/dialogs/cancel-comp.c:57
+#: calendar/gui/dialogs/cancel-comp.c:59
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "�z�T�w�n�����ΧR���o�ӷ|ij�H"
 
+#: calendar/gui/dialogs/cancel-comp.c:65
+msgid ""
+"The task being deleted is assigned, would you like to send a cancellation "
+"notice?"
+msgstr ""
+
 # calendar/gui/dialogs/delete-comp.c:125
-#: calendar/gui/dialogs/cancel-comp.c:62
+#: calendar/gui/dialogs/cancel-comp.c:68
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "�z�T�w�n�����ΧR���o�Ӥu�@�H"
 
+#: calendar/gui/dialogs/cancel-comp.c:74
+msgid ""
+"The journal entry being deleted is published, would you like to send a "
+"cancellation notice?"
+msgstr ""
+
 # calendar/gui/dialogs/delete-comp.c:102
-#: calendar/gui/dialogs/cancel-comp.c:67
+#: calendar/gui/dialogs/cancel-comp.c:77
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "�z�T�w�n�����ΧR���o�Ӥ�x���ءH"
 
@@ -5230,32 +5264,32 @@ msgid "Due "
 msgstr "����"
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:342
+#: calendar/gui/dialogs/comp-editor.c:343
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "���ॿ�T�a��s�ɮ�"
 
-#: calendar/gui/dialogs/comp-editor.c:345
+#: calendar/gui/dialogs/comp-editor.c:346
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:348
+#: calendar/gui/dialogs/comp-editor.c:349
 msgid "You don't have permissions to update this object"
 msgstr ""
 
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:351
+#: calendar/gui/dialogs/comp-editor.c:352
 #, fuzzy
 msgid "Could not update object"
 msgstr "���ॿ�T�a��s�ɮ�"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:797
+#: calendar/gui/dialogs/comp-editor.c:798
 msgid "Edit Appointment"
 msgstr "�s����|"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:802
+#: calendar/gui/dialogs/comp-editor.c:803
 #, c-format
 msgid "Appointment - %s"
 msgstr "���| - %s"
@@ -5263,36 +5297,36 @@ msgstr "���| - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:805
+#: calendar/gui/dialogs/comp-editor.c:806
 #, c-format
 msgid "Task - %s"
 msgstr "�u�@ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
+#: calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Journal entry - %s"
 msgstr "��x���� - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:822
+#: calendar/gui/dialogs/comp-editor.c:823
 msgid "No summary"
 msgstr "�S���K�n"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1203
-#: calendar/gui/e-calendar-table.c:1067 calendar/gui/e-day-view.c:3818
-#: calendar/gui/e-week-view.c:3713 composer/e-msg-composer.c:1017
+#: calendar/gui/dialogs/comp-editor.c:1213
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
+#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
 msgid "Save as..."
 msgstr "�t�s�s��..."
 
-#: calendar/gui/dialogs/comp-editor.c:1299
-#: calendar/gui/dialogs/comp-editor.c:1323
-#: calendar/gui/dialogs/comp-editor.c:1347
+#: calendar/gui/dialogs/comp-editor.c:1314
+#: calendar/gui/dialogs/comp-editor.c:1338
+#: calendar/gui/dialogs/comp-editor.c:1362
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1374
+#: calendar/gui/dialogs/comp-editor.c:1389
 msgid "Unable to obtain current version!"
 msgstr "�L�k���o�ثe�������I"
 
@@ -5548,7 +5582,7 @@ msgid "Member"
 msgstr "�|��"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1010
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5562,7 +5596,7 @@ msgstr "����"
 # mail/message-list.c:1081
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:54
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "���p"
@@ -5658,7 +5692,7 @@ msgstr "��"
 msgid "first"
 msgstr "�G"
 
-#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:86
+#: calendar/gui/dialogs/recurrence-page.c:1063 filter/filter-datespec.c:70
 msgid "second"
 msgstr "��"
 
@@ -5688,7 +5722,7 @@ msgid "Other Date"
 msgstr "�䥦�ǯu"
 
 # calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:1120 filter/filter-datespec.c:73
 msgid "day"
 msgstr "�C��"
 
@@ -5811,24 +5845,32 @@ msgstr "% ����"
 msgid "Date Completed:"
 msgstr "��������G"
 
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
+#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+msgid "Needs Action"
+msgstr "�ݭn�ʧ@"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Progress"
 msgstr "�i��"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:887
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: my-evolution/e-summary-preferences.c:883
 msgid "URL:"
 msgstr "���}�G"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Priority:"
 msgstr "�u������(_P)�G"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:16
 msgid "_Status:"
 msgstr "���A(_S)�G"
 
@@ -5846,7 +5888,7 @@ msgstr "�����u�@"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:934
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -5929,21 +5971,21 @@ msgid "100%"
 msgstr "100%"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2750
-#: calendar/gui/e-week-view.c:1853
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
+#: calendar/gui/e-week-view.c:1854
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "�R����w���s���H"
 
 # mail/folder-browser.c:686
-#: calendar/gui/e-calendar-table.c:984 calendar/gui/e-day-view.c:3594
-#: calendar/gui/e-week-view.c:3471 mail/folder-browser.c:1676
-#: shell/e-shortcuts-view.c:392 ui/evolution-addressbook.xml.h:39
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
+#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "�}��(_O)"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/e-calendar-table.c:985
+#: calendar/gui/e-calendar-table.c:988
 #, fuzzy
 msgid "_Save as..."
 msgstr "�t�s�s��..."
@@ -5951,26 +5993,26 @@ msgstr "�t�s�s��..."
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-calendar-table.c:986 calendar/gui/e-day-view.c:3596
-#: calendar/gui/e-week-view.c:3445 calendar/gui/e-week-view.c:3473
-#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:30
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:107
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
+#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "�C�L(_P)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-day-view.c:3601
-#: calendar/gui/e-week-view.c:3478 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
+#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "�ŤU(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-week-view.c:3479 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
+#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
@@ -5978,50 +6020,50 @@ msgstr "�ƻs(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-calendar-table.c:992 calendar/gui/e-day-view.c:3565
-#: calendar/gui/e-day-view.c:3603 calendar/gui/e-week-view.c:3449
-#: calendar/gui/e-week-view.c:3480 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
+#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
+#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "�K�W(_P)"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-calendar-table.c:996
+#: calendar/gui/e-calendar-table.c:999
 #, fuzzy
 msgid "_Assign Task"
 msgstr "�����u�@"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-table.c:997
+#: calendar/gui/e-calendar-table.c:1000
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "�H i_Calendar ��H"
 
 # calendar/gui/e-calendar-table.c:707
-#: calendar/gui/e-calendar-table.c:998
+#: calendar/gui/e-calendar-table.c:1001
 msgid "_Mark as Complete"
 msgstr "�Хܧ���(_M)"
 
 # calendar/gui/e-calendar-table.c:713
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:1002
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "�Хܬ��w�������u�@(_M)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1007
 msgid "_Delete Selected Tasks"
 msgstr "�R����w���u�@(_D)"
 
-#: calendar/gui/e-calendar-table.c:1271 calendar/gui/e-day-view.c:7418
-#: calendar/gui/e-week-view.c:4194
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
+#: calendar/gui/e-week-view.c:4255
 msgid "Updating objects"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-calendar-table.c:1354
+#: calendar/gui/e-calendar-table.c:1357
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "�Ы��o�̷s�W�s���u�@"
@@ -6033,8 +6075,8 @@ 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:943
-#: camel/camel-filter-driver.c:1051
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:992
+#: camel/camel-filter-driver.c:1100
 msgid "Complete"
 msgstr "����"
 
@@ -6071,11 +6113,9 @@ msgid "Start Date"
 msgstr "�}�l���"
 
 # calendar/gui/e-calendar-table.c:159
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:774
-#: shell/e-shortcuts.c:1030
+#: my-evolution/component-factory.c:51 shell/e-shell.c:740
+#: shell/e-shortcuts.c:1051
 msgid "Summary"
 msgstr "�K�n"
 
@@ -6130,7 +6170,7 @@ msgstr "���j %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:284 calendar/gui/e-day-view.c:1413
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1421
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -6140,7 +6180,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:292 calendar/gui/e-day-view.c:1440
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1448
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
@@ -6149,7 +6189,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:638 calendar/gui/e-week-view.c:375
+#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "�W��"
@@ -6158,69 +6198,68 @@ msgstr "�W��"
 # 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:641 calendar/gui/e-week-view.c:378
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "�U��"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/e-day-view.c:3549
+#: calendar/gui/e-day-view.c:3586
 msgid "New _Appointment"
 msgstr "�s�W���|(_A)"
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-day-view.c:3551 calendar/gui/e-week-view.c:3439
+#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
 msgid "New All Day _Event"
 msgstr "�s�W���ѭn��(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-day-view.c:3553 calendar/gui/e-week-view.c:3440
+#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
 #, fuzzy
 msgid "New Meeting"
 msgstr "�|ij"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-day-view.c:3555 calendar/gui/e-week-view.c:3441
+#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
 msgid "New Task"
 msgstr "�s�W�u�@"
 
 # ui/evolution-contact-editor.xml.h:7
 # ui/evolution-event-editor.xml.h:38
 # ui/evolution-task-editor-dialog.xml.h:41
-#: calendar/gui/e-day-view.c:3560 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "�C�L..."
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-day-view.c:3572 calendar/gui/e-week-view.c:3455
+#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "����(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-day-view.c:3574 calendar/gui/e-week-view.c:3456
+#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
 msgid "_Go to Date..."
 msgstr "����w���(_G)..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-day-view.c:3579 calendar/gui/e-week-view.c:3460
+#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "�o�G �Ŷ�/���L ��T(_P)"
 
 # mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3584 calendar/gui/e-week-view.c:3464
-#: ui/evolution.xml.h:39
+#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
 #, fuzzy
 msgid "_Configure..."
 msgstr "�l��]�w"
 
 # mail/mail-config.glade.h:40
-#: calendar/gui/e-day-view.c:3586 calendar/gui/e-week-view.c:3465
+#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
 #, fuzzy
 msgid "_Configure Pilot..."
 msgstr "�l��]�w"
@@ -6229,49 +6268,49 @@ msgstr "�l��]�w"
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-day-view.c:3595 calendar/gui/e-week-view.c:3472
-#: mail/folder-browser.c:1678 ui/evolution-mail-message.xml.h:110
+#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
+#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "�t�s�s��(_S)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3484
+#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "�|ij�Ƶ{(_M)"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-day-view.c:3608 calendar/gui/e-week-view.c:3485
+#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "�H i_Calendar ��H"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: calendar/gui/e-day-view.c:3613 calendar/gui/e-week-view.c:3490
+#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
 msgid "Make this Occurrence _Movable"
 msgstr "�N�o�Өƥ�Хܦ��i����(_M)"
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-day-view.c:3614 calendar/gui/e-week-view.c:3491
+#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
 msgid "Delete this _Occurrence"
 msgstr "�R���o�Өƥ�(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-day-view.c:3615 calendar/gui/e-week-view.c:3492
+#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
 msgid "Delete _All Occurrences"
 msgstr "�R�������ƥ�(_A)"
 
-#: calendar/gui/e-day-view.c:3970 calendar/gui/e-week-view.c:3841
-#: shell/e-shell-view-menu.c:638
+#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
 # camel/camel-filter-driver.c:871
-#: calendar/gui/e-day-view.c:3976 calendar/gui/e-week-view.c:3847
-#: shell/e-shell-view-menu.c:646
+#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: shell/e-shell-view-menu.c:647
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "����L�o���o�Ϳ��~�G %s: %s"
@@ -6324,7 +6363,7 @@ msgid "Task Due: <b>"
 msgstr ""
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "��ƾ��T"
@@ -6339,43 +6378,51 @@ msgstr "��ƾ�"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
 #, fuzzy
 msgid "An unknown person"
 msgstr "�������H���"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:876
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:891
+#: calendar/gui/e-itip-control.c:892
 msgid "<i>None</i>"
 msgstr ""
 
+# addressbook/backend/ebook/e-card.c:3442
+#: calendar/gui/e-itip-control.c:898
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"�g�n�G"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:910
 #, fuzzy
 msgid "Status:"
 msgstr "���A(_S)�G"
 
-#: calendar/gui/e-itip-control.c:908 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:862
-#: calendar/gui/itip-utils.c:382
+#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
+#: calendar/gui/itip-utils.c:490
 msgid "Accepted"
 msgstr "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:912 calendar/gui/itip-utils.c:385
+#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "�ȭq"
 
-#: calendar/gui/e-itip-control.c:916 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:863
-#: calendar/gui/itip-utils.c:388 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
+#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
 msgid "Declined"
 msgstr "����"
 
@@ -6383,336 +6430,336 @@ msgstr "����"
 # calendar/gui/event-editor.c:1601
 # calendar/gui/event-editor.c:1628
 # camel/providers/smtp/camel-smtp-transport.c:221
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1223 calendar/gui/e-meeting-model.c:258
-#: calendar/gui/e-meeting-model.c:293 calendar/gui/e-meeting-model.c:358
-#: calendar/gui/e-meeting-model.c:820 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
+#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
 #: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
-#: mail/mail-display.c:848 widgets/misc/e-charset-picker.c:58
+#: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "����"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:971 calendar/gui/e-itip-control.c:999
-#: calendar/gui/e-itip-control.c:1025 calendar/gui/e-itip-control.c:1038
-#: calendar/gui/e-itip-control.c:1051 calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
+#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
 #, fuzzy
 msgid "Choose an action:"
 msgstr "��ܤ@�Ӱʧ@"
 
-#: calendar/gui/e-itip-control.c:972
+#: calendar/gui/e-itip-control.c:979
 #, fuzzy
 msgid "Update"
 msgstr "�u�@��s"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1004
-#: calendar/gui/e-itip-control.c:1027 calendar/gui/e-itip-control.c:1040
-#: calendar/gui/e-itip-control.c:1053 calendar/gui/e-itip-control.c:1066
-#: shell/e-shell.c:2154 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
+#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
+#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "�T�{"
 
-#: calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1007
 #, fuzzy
 msgid "Accept"
 msgstr "����"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1001
+#: calendar/gui/e-itip-control.c:1008
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "�ȭq"
 
-#: calendar/gui/e-itip-control.c:1002
+#: calendar/gui/e-itip-control.c:1009
 #, fuzzy
 msgid "Decline"
 msgstr "����"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1026
+#: calendar/gui/e-itip-control.c:1033
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1046
 msgid "Update respondent status"
 msgstr ""
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "�u�@��T"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:1065 calendar/gui/itip-utils.c:402
-#: shell/evolution-shell-component.c:1081 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
+#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "����"
 
-#: calendar/gui/e-itip-control.c:1117
+#: calendar/gui/e-itip-control.c:1150
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> �w�g�o�G�|ij��T�C"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1151
 msgid "Meeting Information"
 msgstr "�|ij��T"
 
-#: calendar/gui/e-itip-control.c:1122
+#: calendar/gui/e-itip-control.c:1155
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> �ШD�z�X�u�����|ij�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1123
+#: calendar/gui/e-itip-control.c:1156
 msgid "Meeting Proposal"
 msgstr "�|ij����"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1160
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> �Ʊ�[�J�@�ӬJ�s���|ij�C"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1128
+#: calendar/gui/e-itip-control.c:1161
 msgid "Meeting Update"
 msgstr "�|ij��s"
 
-#: calendar/gui/e-itip-control.c:1132
+#: calendar/gui/e-itip-control.c:1165
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> �Ʊ榬��̷s���|ij��T�C"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1166
 msgid "Meeting Update Request"
 msgstr "�|ij��s�ШD"
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> �w�g���ФF�|ij�ШD�C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1157
+#: calendar/gui/e-itip-control.c:1174
 msgid "Meeting Reply"
 msgstr "�|ij����"
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1181
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> �w�g�����|ij�C"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-itip-control.c:1182
 msgid "Meeting Cancellation"
 msgstr "�|ij����"
 
-#: calendar/gui/e-itip-control.c:1166 calendar/gui/e-itip-control.c:1239
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
+#: calendar/gui/e-itip-control.c:1285
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> �ǰe�F�@�����H�z�Ѫ��T���C"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1167
+#: calendar/gui/e-itip-control.c:1190
 msgid "Bad Meeting Message"
 msgstr "�����T���|ij�T��"
 
-#: calendar/gui/e-itip-control.c:1189
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> �w�g�o�G�F�u�@��T�C"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1212
 msgid "Task Information"
 msgstr "�u�@��T"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> �n�D�z�i��u�@�C"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1217
 msgid "Task Proposal"
 msgstr "�u�@�p�e"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1221
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> �Ʊ�[�J�@���J�s���u�@�C"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1222
 msgid "Task Update"
 msgstr "�u�@��s"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1226
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> �Ʊ榬��̷s���u�@��T�C"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1227
 msgid "Task Update Request"
 msgstr "�u�@��s�ШD"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1234
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> �w�g�^�������u�@�C"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1235
 msgid "Task Reply"
 msgstr "�u�@�^��"
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1242
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> �w�g�����u�@�C"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1243
 msgid "Task Cancellation"
 msgstr "�u�@����"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1251
 msgid "Bad Task Message"
 msgstr "�����T���u�@�T��"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1270
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> �w�g�o�G �Ŷ�/���L ��T�C"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1271
 msgid "Free/Busy Information"
 msgstr "�Ŷ�/���L ��T"
 
-#: calendar/gui/e-itip-control.c:1264
+#: calendar/gui/e-itip-control.c:1275
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> �ШD�z�� �Ŷ�/���L ��T�C"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1265
+#: calendar/gui/e-itip-control.c:1276
 msgid "Free/Busy Request"
 msgstr "�Ŷ�/���L �ШD"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1280
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> �w�g���� �Ŷ�/���L �ШD�C"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1281
 msgid "Free/Busy Reply"
 msgstr "�Ŷ�/���L �^��"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1286
 msgid "Bad Free/Busy Message"
 msgstr "�����T�� �Ŷ�/���L �T��"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1365
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "��Ƨ��n���w�g�l���åB����_��C"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1384
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "�o�Ӷl��u�]�t�K��ƥ�����̡C"
 
-#: calendar/gui/e-itip-control.c:1401 calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1443
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1567 calendar/gui/e-itip-control.c:1659
+#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1570 calendar/gui/e-itip-control.c:1662
+#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "�U���s�D�o�e���A���ɵo�Ϳ��~"
 
-#: calendar/gui/e-itip-control.c:1573 calendar/gui/e-itip-control.c:1665
+#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
-#: calendar/gui/e-itip-control.c:1576 calendar/gui/e-itip-control.c:1668
+#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1579
+#: calendar/gui/e-itip-control.c:1590
 msgid "Update complete\n"
 msgstr "��s����\n"
 
-#: calendar/gui/e-itip-control.c:1582
+#: calendar/gui/e-itip-control.c:1593
 #, fuzzy
 msgid "Calendar file could not be updated!\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
-#: calendar/gui/e-itip-control.c:1611 calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1632
+#: calendar/gui/e-itip-control.c:1643
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1644
+#: calendar/gui/e-itip-control.c:1655
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1682
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1685
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1709
+#: calendar/gui/e-itip-control.c:1720
 msgid "Removal Complete"
 msgstr "��������"
 
-#: calendar/gui/e-itip-control.c:1739 calendar/gui/e-itip-control.c:1789
+#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
 msgid "Item sent!\n"
 msgstr "���ضǰe�I\n"
 
-#: calendar/gui/e-itip-control.c:1741 calendar/gui/e-itip-control.c:1793
+#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
 msgid "The item could not be sent!\n"
 msgstr "����ǰe�o�Ӷ��ءI\n"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1907
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "��ܸ�Ƨ�"
 
 # mail/mail-account-gui.c:682
-#: calendar/gui/e-itip-control.c:1903
+#: calendar/gui/e-itip-control.c:1914
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "��ܸ�Ƨ�"
@@ -6770,7 +6817,7 @@ msgid "Chair Persons"
 msgstr "�D�u"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1748
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
 msgid "Required Participants"
 msgstr "�X�u��"
 
@@ -6783,64 +6830,57 @@ msgid "Non-Participants"
 msgstr "�ʮu��"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:816
+#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
 msgid "Individual"
 msgstr "�ӤH"
 
 # shell/e-shortcuts-view.c:137
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:817
+#: calendar/gui/e-meeting-model.c:819
 msgid "Group"
 msgstr "�էO"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:820
 msgid "Resource"
 msgstr "�귽"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:821
 msgid "Room"
 msgstr "�|ij��"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:834
 msgid "Chair"
 msgstr "�D�u"
 
 # mail/mail-config.glade.h:61
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
 msgid "Required Participant"
 msgstr "�X�u��"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:836
 msgid "Optional Participant"
 msgstr "�C�u��"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:837
 msgid "Non-Participant"
 msgstr "�ʮu��"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:861
-msgid "Needs Action"
-msgstr "�ݭn�ʧ@"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:864 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "�ȭq"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:865
+#: calendar/gui/e-meeting-model.c:867
 msgid "Delegated"
 msgstr "�w�e��"
 
@@ -6960,59 +7000,54 @@ msgid "Meeting _end time:"
 msgstr "�|ij�����ɶ�(_E)�G"
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:362
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:1952
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "�}�ҶJ�� %s"
 
 # calendar/gui/e-tasks.c:298
-#: calendar/gui/e-tasks.c:392 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:378 calendar/gui/tasks-control.c:196
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "������J `%s' �̪��u�@"
 
 # calendar/gui/e-tasks.c:310
-#: calendar/gui/e-tasks.c:404
+#: calendar/gui/e-tasks.c:390
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "���䴩�Χ@���J `%s'  ��������k"
 
 # calendar/gui/gnome-cal.c:840
-#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "����}�� `%s' ������Ƨ�"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:558
+#: calendar/gui/e-tasks.c:522
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "�������"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:581
+#: calendar/gui/e-tasks.c:545
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "�R����w���s���H"
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:674
+#: calendar/gui/e-tasks.c:638
 #, fuzzy
 msgid "Expunging"
 msgstr "�R����Ƨ�"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-week-view.c:3438
+#: calendar/gui/e-week-view.c:3471
 msgid "New _Appointment..."
 msgstr "�s�W���|(_A)..."
 
-# calendar/gui/e-day-view.c:3164
-# calendar/gui/e-week-view.c:3294
-#: calendar/gui/e-week-view.c:3489
-msgid "_Delete this Appointment"
-msgstr "�R���o�Ӭ��|(_D)"
-
 # calendar/gui/gnome-cal.c:840
 #: calendar/gui/gnome-cal.c:1522
 #, c-format
@@ -7027,11 +7062,18 @@ msgstr "���䴩�Χ@�}�� `%s'  ��������k"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1924
 #, fuzzy, c-format
 msgid "Opening calendar at %s"
 msgstr "�}�Ҹ�Ƨ� %s"
 
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#: calendar/gui/gnome-cal.c:1963
+#, fuzzy
+msgid "Opening default tasks folder"
+msgstr "�}�Ҹ�Ƨ� %s"
+
 # calendar/gui/goto-dialog.glade.h:1
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -7102,65 +7144,80 @@ msgstr "10��"
 msgid "September"
 msgstr "9��"
 
-#: calendar/gui/itip-utils.c:280
+#: calendar/gui/itip-utils.c:383
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:311
+#: calendar/gui/itip-utils.c:419
 msgid "An organizer must be set."
 msgstr "�������w�@�ӥl���H�C"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:354
+#: calendar/gui/itip-utils.c:462
 #, fuzzy
 msgid "Event information"
 msgstr "��ƾ��T"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/itip-utils.c:356
+#: calendar/gui/itip-utils.c:464
 #, fuzzy
 msgid "Task information"
 msgstr "�u�@��T"
 
 # mail/mail-config.glade.h:47
-#: calendar/gui/itip-utils.c:358
+#: calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Journal information"
 msgstr "�����T"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/itip-utils.c:360
+#: calendar/gui/itip-utils.c:468
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "�Ŷ�/���L ��T"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/itip-utils.c:362
+#: calendar/gui/itip-utils.c:470
 #, fuzzy
 msgid "Calendar information"
 msgstr "��ƾ��T"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:506
 #, fuzzy
 msgid "Updated"
 msgstr "�u�@��s"
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/itip-utils.c:406
+#: calendar/gui/itip-utils.c:514
 #, fuzzy
 msgid "Refresh"
 msgstr "����M��"
 
-#: calendar/gui/itip-utils.c:410
+#: calendar/gui/itip-utils.c:518
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:660
+#: calendar/gui/itip-utils.c:697
 msgid "You must be an attendee of the event."
 msgstr ""
 
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1092
+# addressbook/gui/component/addressbook-factory.c:42
+# calendar/conduits/calendar/calendar-conduit.c:1151
+# calendar/conduits/todo/todo-conduit.c:965
+# calendar/gui/alarm-notify/notify-main.c:98
+# calendar/gui/main.c:57
+#: calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not activate Bonobo"
+msgstr "�����l�� Bonobo"
+
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/main.c:96
+#: calendar/gui/main.c:99
 msgid "Could not create the component editor factory"
 msgstr "����إߤ���s�边�u�t"
 
@@ -7454,9 +7511,8 @@ msgstr "�C�L��ƾ�"
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:2945
-#: my-evolution/e-summary.c:619 ui/evolution-addressbook.xml.h:19
-#: ui/evolution-mail-message.xml.h:66
+#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "�w���C�L"
 
@@ -7501,8 +7557,8 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2430
-#: mail/mail-callbacks.c:2672
+#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
+#: mail/mail-callbacks.c:2883
 msgid "Do not ask me again."
 msgstr "���n�A��ܳo�ӰT���C"
 
@@ -7571,20 +7627,36 @@ msgstr "�פJ VCard �ɮר� Evolution�C"
 msgid "Imports vCalendar files into Evolution"
 msgstr "�פJ VCard �ɮר� Evolution�C"
 
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: calendar/importers/icalendar-importer.c:168
+#, fuzzy, c-format
+msgid "Can't get storage list from registry: %s"
+msgstr ""
+"�L�k���o�l��G%s �q��Ƨ� %s\n"
+"  %s"
+
+# camel/providers/pop3/camel-pop3-store.c:215
+#: calendar/importers/icalendar-importer.c:180
+#, fuzzy, c-format
+msgid "Can't call getFolderAtPath on storage: %s"
+msgstr "������s�u����A���G%s"
+
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/importers/icalendar-importer.c:424
+#: calendar/importers/icalendar-importer.c:482
 #, fuzzy
 msgid "Reminder!!"
 msgstr "����"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/importers/icalendar-importer.c:638
+#: calendar/importers/icalendar-importer.c:696
 #, fuzzy
 msgid "Calendar Events"
 msgstr "��ƾ�T��"
 
 # importers/pine-importer.c:705
-#: calendar/importers/icalendar-importer.c:663
+#: calendar/importers/icalendar-importer.c:721
 #, fuzzy
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
@@ -7595,95 +7667,95 @@ msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/importers/icalendar-importer.c:670
+#: calendar/importers/icalendar-importer.c:728
 #, fuzzy
 msgid "Gnome Calendar"
 msgstr "��ƾ�"
 
-#: calendar/pcs/query.c:248
+#: calendar/pcs/query.c:255
 msgid "time-now expects 0 arguments"
 msgstr "time-now �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:272
+#: calendar/pcs/query.c:279
 msgid "make-time expects 1 argument"
 msgstr "make-time �n�D 1 �ӰѼ�"
 
-#: calendar/pcs/query.c:277
+#: calendar/pcs/query.c:284
 msgid "make-time expects argument 1 to be a string"
 msgstr "make-time �n�D�Ѽ� 1 ���r��"
 
-#: calendar/pcs/query.c:285
+#: calendar/pcs/query.c:292
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr "make-time �Ѽ� 1 ������ ISO 8601 ���/�ɶ��r��"
 
-#: calendar/pcs/query.c:314
+#: calendar/pcs/query.c:321
 msgid "time-add-day expects 2 arguments"
 msgstr "time-add-day �n�D 2 �ӰѼ�"
 
-#: calendar/pcs/query.c:319
+#: calendar/pcs/query.c:326
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr "time-add-day �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:326
+#: calendar/pcs/query.c:333
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr "time-add-day �n�D�Ѽ� 2 �����"
 
-#: calendar/pcs/query.c:353
+#: calendar/pcs/query.c:360
 msgid "time-day-begin expects 1 argument"
 msgstr "time-day-begin �n�D 1 �ӰѼ�"
 
-#: calendar/pcs/query.c:358
+#: calendar/pcs/query.c:365
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr "time-day-begin �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:385
+#: calendar/pcs/query.c:392
 msgid "time-day-end expects 1 argument"
 msgstr "time-day-end �n�D 1 �ӰѼ�"
 
-#: calendar/pcs/query.c:390
+#: calendar/pcs/query.c:397
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr "time-day-end �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:426
+#: calendar/pcs/query.c:433
 msgid "get-vtype expects 0 arguments"
 msgstr "get-vtype �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:522
+#: calendar/pcs/query.c:529
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr "occur-in-time-range? �n�D 2 �ӰѼ�"
 
-#: calendar/pcs/query.c:527
+#: calendar/pcs/query.c:534
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr "occur-in-time-range? �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:534
+#: calendar/pcs/query.c:541
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr "occur-in-time-range? �n�D�Ѽ� 2 �� time_t"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:664
+#: calendar/pcs/query.c:671
 msgid "contains? expects 2 arguments"
 msgstr "contains? �n�D 2 �ӰѼ�"
 
-#: calendar/pcs/query.c:669
+#: calendar/pcs/query.c:676
 msgid "contains? expects argument 1 to be a string"
 msgstr "contains? �n�D�Ѽ� 1 ���r��"
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:683
 msgid "contains? expects argument 2 to be a string"
 msgstr "contains? �n�D�Ѽ� 2 ���r��"
 
-#: calendar/pcs/query.c:693
+#: calendar/pcs/query.c:700
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr "contains? �n�D�Ѽ� 1 �� \"any\", \"summary\", \"description\" �䤤���@"
 
-#: calendar/pcs/query.c:735
+#: calendar/pcs/query.c:742
 msgid "has-categories? expects at least 1 argument"
 msgstr "has-categories? �n�D�ܤ� 1 �ӰѼ�"
 
-#: calendar/pcs/query.c:747
+#: calendar/pcs/query.c:754
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
@@ -7691,22 +7763,22 @@ msgstr ""
 "has-categories? �n�D�Ҧ����ѼƬ��r��ζȦ����@�Ӭ����L�� false(#f) ���Ѽ�"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:835
+#: calendar/pcs/query.c:842
 msgid "is-completed? expects 0 arguments"
 msgstr "is-completed? �n�D 0 �ӰѼ�"
 
 # camel/providers/smtp/camel-smtp-transport.c:170
-#: calendar/pcs/query.c:880
+#: calendar/pcs/query.c:887
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "is-completed? �n�D 0 �ӰѼ�"
 
-#: calendar/pcs/query.c:885
+#: calendar/pcs/query.c:892
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "time-day-begin �n�D�Ѽ� 1 �� time_t"
 
-#: calendar/pcs/query.c:1160
+#: calendar/pcs/query.c:1167
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr "�j�M���ܥX���ȵ��G���ର���L��"
 
@@ -9445,93 +9517,107 @@ msgstr "�z������u�W�u�@�~�৹�����ާ@"
 
 # camel/camel-filter-driver.c:534
 # camel/camel-filter-driver.c:543
-#: camel/camel-filter-driver.c:710 camel/camel-filter-driver.c:719
+#: camel/camel-filter-driver.c:759 camel/camel-filter-driver.c:768
 msgid "Syncing folders"
 msgstr "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:808 camel/camel-filter-driver.c:1194
+#: camel/camel-filter-driver.c:857 camel/camel-filter-driver.c:1243
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "���R�L�o���o�Ϳ��~�G %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:817 camel/camel-filter-driver.c:1200
+#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1249
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "����L�o���o�Ϳ��~�G %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:884
+#: camel/camel-filter-driver.c:933
 msgid "Unable to open spool folder"
 msgstr "�L�k�}�� spool ��Ƨ�"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:942
 msgid "Unable to process spool folder"
 msgstr "�L�k�B�z spool ��Ƨ�"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:908
+#: camel/camel-filter-driver.c:957
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "�����l�� %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:912
+#: camel/camel-filter-driver.c:961
 msgid "Cannot open message"
 msgstr "����}�Ҷl��"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:913 camel/camel-filter-driver.c:925
+#: camel/camel-filter-driver.c:962 camel/camel-filter-driver.c:974
 #, c-format
 msgid "Failed on message %d"
 msgstr "�b�� %d �ʶl��o�Ϳ��~"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/camel-filter-driver.c:939 camel/camel-filter-driver.c:1046
+#: camel/camel-filter-driver.c:988 camel/camel-filter-driver.c:1095
 msgid "Syncing folder"
 msgstr "�P�B�B�z��Ƨ�"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1013
+#: camel/camel-filter-driver.c:1062
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "���b������ %d / %d �ʶl��"
 
 # camel/camel-filter-driver.c:753
 # camel/camel-filter-driver.c:771
-#: camel/camel-filter-driver.c:1028
+#: camel/camel-filter-driver.c:1077
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "�b�� %d / %d �ʶl�󥢱�"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:140
+#: camel/camel-filter-search.c:136
 #, fuzzy
 msgid "Failed to retrieve message"
 msgstr "�ѱK�l�󥢱ѡC"
 
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: camel/camel-filter-search.c:384
+#, fuzzy
+msgid "Invalid arguments to (system-flag)"
+msgstr "�L�Ī��Ѽ�"
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: camel/camel-filter-search.c:399
+#, fuzzy
+msgid "Invalid arguments to (user-tag)"
+msgstr "�L�Ī��Ѽ�"
+
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:538
+#: camel/camel-filter-search.c:511
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-search.c:577
+#: camel/camel-filter-search.c:547
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-search.c:439
 # camel/camel-filter-search.c:445
-#: camel/camel-filter-search.c:679 camel/camel-filter-search.c:687
+#: camel/camel-filter-search.c:649 camel/camel-filter-search.c:657
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "����L�o���j�M�o�Ϳ��~�G %s: %s"
@@ -9598,7 +9684,7 @@ msgstr "�N�l�󲾨� %s"
 msgid "Copying messages"
 msgstr "�N�l��ƻs�� %s"
 
-#: camel/camel-gpg-context.c:696
+#: camel/camel-gpg-context.c:705
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9606,15 +9692,15 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:719
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:733
+#: camel/camel-gpg-context.c:742
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:741
+#: camel/camel-gpg-context.c:750
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9622,37 +9708,37 @@ msgid ""
 msgstr ""
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:752 camel/camel-gpg-context.c:1175
-#: camel/camel-gpg-context.c:1281 camel/camel-gpg-context.c:1356
-#: camel/camel-gpg-context.c:1412 mail/mail-send-recv.c:534
+#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
+#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
+#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "�w�����C"
 
-#: camel/camel-gpg-context.c:770
+#: camel/camel-gpg-context.c:779
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:776
+#: camel/camel-gpg-context.c:785
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "�q IMAP ���A���Ǧ^�������^���G %s"
 
 # camel/camel-pgp-context.c:1073
-#: camel/camel-gpg-context.c:782
+#: camel/camel-gpg-context.c:795
 #, fuzzy
 msgid "No data provided"
 msgstr "�S�����w��Ƨ��W�١C"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:827
+#: camel/camel-gpg-context.c:840
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1077
+#: camel/camel-gpg-context.c:1095
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -9662,21 +9748,21 @@ msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1083
+#: camel/camel-gpg-context.c:1101
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1166 camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1347 camel/camel-gpg-context.c:1403
+#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
+#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "�ѱK�l�󥢱ѡC"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1258
+#: camel/camel-gpg-context.c:1303
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "����إ߼Ȧs�ɮסG%s"
@@ -9708,26 +9794,26 @@ msgstr "�L�k��w '%s'"
 # camel/camel-movemail.c:138
 # camel/camel-movemail.c:185
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
+#: camel/camel-lock.c:93 camel/camel-lock.c:112
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "�L�k�إߥΩ� %s: %s ����w�ɮ�"
 
 # camel/camel-lock.c:151
 # camel/camel-movemail.c:219
-#: camel/camel-lock.c:150
+#: camel/camel-lock.c:152
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "���ը��o %s �W����w�ɮ׹O�ɡC�еy��A�դ@���C"
 
 # camel/camel-lock.c:201
-#: camel/camel-lock.c:204
+#: camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "�ϥ� fcntl(2) ���o�ꥢ�ѡG %s"
 
 # camel/camel-lock.c:255
-#: camel/camel-lock.c:266
+#: camel/camel-lock.c:268
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "�ϥ� flock(2) ���o�ꥢ�ѡG %s"
@@ -9797,11 +9883,15 @@ msgstr "�g�J�l��Ȧs�ɮ׮ɵo�Ϳ��~�G%s"
 msgid "Error copying mail temp file: %s"
 msgstr "�ƻs�l��Ȧs�ɮ׮ɵo�Ϳ��~�G%s"
 
-#: camel/camel-multipart-encrypted.c:257 camel/camel-multipart-encrypted.c:272
+#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:325
+#: camel/camel-multipart-encrypted.c:287
+msgid "Failed to decrypt MIME part: invalid structure"
+msgstr ""
+
+#: camel/camel-multipart-encrypted.c:327
 msgid "Failed to decrypt MIME part: parse error"
 msgstr ""
 
@@ -9960,7 +10050,7 @@ msgstr ""
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:1002
 msgid "Bad authentication response from server."
 msgstr "�Ӧۦ��A�������}�\�i�^���C"
 
@@ -10166,25 +10256,166 @@ msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
 
-# camel/camel-tcp-stream-openssl.c:423
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:566
+#, fuzzy
+msgid "Unable to get issuer's certificate"
+msgstr "�����Үѥ��ѡC"
+
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get Certificate Revocation List"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:570
+#, fuzzy
+msgid "Unable to decrypt certificate signature"
+msgstr "�����Үѥ��ѡC"
+
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt Certificate Revocation List signature"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decode issuer's public key"
+msgstr ""
+
+# mail/mail-crypto.c:59
+#: camel/camel-tcp-stream-openssl.c:576
+#, fuzzy
+msgid "Certificate signature failure"
+msgstr "�L�k�إߤ@�� PGP ñ�W�奻�C"
+
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate Revocation List signature failure"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:582
+#, fuzzy
+msgid "Certificate has expired"
+msgstr "�Ү� ID�G"
+
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "CRL not yet valid"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL has expired"
+msgstr ""
+
+# shell/e-shell-importer.c:404
+#: camel/camel-tcp-stream-openssl.c:591
+#, fuzzy
+msgid "Error in CRL"
+msgstr "���J %s �ɵo�Ϳ��~"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:394
+#: camel/camel-tcp-stream-openssl.c:593
+#, fuzzy
+msgid "Out of memory"
+msgstr "���b�줽��"
+
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Zero-depth self-signed certificate"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Self-signed certificate in chain"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Unable to get issuer's certificate locally"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:601
+#, fuzzy
+msgid "Unable to verify leaf signature"
+msgstr "�����Үѥ��ѡC"
+
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Certificate chain too long"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:605
+#, fuzzy
+msgid "Certificate Revoked"
+msgstr "�Ү� ID�G"
+
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Invalid Certificate Authority (CA)"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Path length exceeded"
+msgstr ""
+
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: camel/camel-tcp-stream-openssl.c:611
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "�L�Ī��Ѽ�"
+
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Certificate untrusted"
+msgstr "�Ү� ID�G"
+
+#: camel/camel-tcp-stream-openssl.c:615
+#, fuzzy
+msgid "Certificate rejected"
+msgstr "�Ү� ID�G"
+
+#: camel/camel-tcp-stream-openssl.c:618
+msgid "Subject/Issuer mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "AKID/SKID mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/Issuer serial mismatch"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "Key usage does not support certificate signing"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:627
+msgid "Error in application verification"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:524
 #, c-format
 msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+msgid "GOOD"
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:530
+msgid "BAD"
 msgstr ""
-"�o��̡G%s\n"
-"�D���G%s"
 
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
-#: camel/camel-tcp-stream-openssl.c:619
-#, c-format
+#: camel/camel-tcp-stream-openssl.c:702
+#, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
 "\n"
 "%s\n"
 "\n"
+"%s\n"
+"\n"
 "Do you wish to accept anyway?"
 msgstr ""
 "�Ӧ� %s �����}�ҮѡG\n"
@@ -10193,29 +10424,10 @@ msgstr ""
 "\n"
 "�z�L�צp�󳣭n�����ܡH"
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:495
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
-msgstr ""
-
-#: camel/camel-tcp-stream-ssl.c:501
-msgid "GOOD"
-msgstr ""
-
-#: camel/camel-tcp-stream-ssl.c:501
-msgid "BAD"
-msgstr ""
-
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:504
+#: camel/camel-tcp-stream-ssl.c:533
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10236,21 +10448,27 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "������R URL `%s'"
 
+# shell/e-shell-importer.c:384
+#: camel/camel-vee-folder.c:618
+#, fuzzy, c-format
+msgid "Error storing `%s': %s"
+msgstr "�Ұ� %s �ɵo�Ϳ��~"
+
 # camel/camel-vee-folder.c:451
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s �S�� %1$s �o�Ӷl��"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:796 camel/camel-vee-folder.c:802
+#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "�ˬd�Ҧ���Ƨ��̪��s�l��"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:262
+#: camel/camel-vee-store.c:296
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
@@ -10259,7 +10477,7 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:319
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
@@ -10267,13 +10485,13 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:310
+#: camel/camel-vee-store.c:332
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:318
+#: camel/camel-vee-store.c:340
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "����N��Ƨ� %s ���s�R�W�� %s�G %s"
@@ -10285,13 +10503,13 @@ msgstr "����N��Ƨ� %s ���s�R�W�� %s�G %s"
 #: camel/providers/imap/camel-imap-command.c:220
 #: camel/providers/imap/camel-imap-command.c:259
 #: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2276
+#: camel/providers/imap/camel-imap-store.c:2404
 msgid "Operation cancelled"
 msgstr "��ʤw����"
 
 # camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2407
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "���A����M���_�s�u"
@@ -10326,47 +10544,47 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "�q IMAP ���A���Ǧ^������ OK �^���G %s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/imap/camel-imap-folder.c:215
+#: camel/providers/imap/camel-imap-folder.c:219
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "����إߥؿ� %s�G %s"
 
 # camel/providers/imap/camel-imap-folder.c:191
-#: camel/providers/imap/camel-imap-folder.c:234
+#: camel/providers/imap/camel-imap-folder.c:238
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "������J�� %s ���K�n"
 
-#: camel/providers/imap/camel-imap-folder.c:300
+#: camel/providers/imap/camel-imap-folder.c:304
 msgid "Folder was destroyed and recreated on server."
 msgstr "��Ƨ��w�}�a�æb���A���W���ءC"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:525
+#: camel/providers/imap/camel-imap-folder.c:535
 msgid "Scanning for changed messages"
 msgstr "���y�ܧ�L���l��"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:1842
-#: camel/providers/imap/camel-imap-folder.c:2323
+#: camel/providers/imap/camel-imap-folder.c:1909
+#: camel/providers/imap/camel-imap-folder.c:2406
 msgid "This message is not currently available"
 msgstr "�o�ʶl��ثe�����i��"
 
-#: camel/providers/imap/camel-imap-folder.c:1999
-#: camel/providers/imap/camel-imap-folder.c:2076
+#: camel/providers/imap/camel-imap-folder.c:2066
+#: camel/providers/imap/camel-imap-folder.c:2143
 msgid "Fetching summary information for new messages"
 msgstr "�����o�s�l�󪺺K�n��T"
 
 # mail/mail-ops.c:992
-#: camel/providers/imap/camel-imap-folder.c:2005
+#: camel/providers/imap/camel-imap-folder.c:2072
 msgid "Scanning for new messages"
 msgstr "���y�s�l��"
 
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2360
+#: camel/providers/imap/camel-imap-folder.c:2443
 msgid "Could not find message body in FETCH response."
 msgstr "�b FETCH ���^�����䤣��l�󪺤���C"
 
@@ -10378,10 +10596,10 @@ msgstr "����}�ҧ֨��ؿ��G%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/imap/camel-imap-message-cache.c:257
-#: camel/providers/imap/camel-imap-message-cache.c:314
-#: camel/providers/imap/camel-imap-message-cache.c:345
-#: camel/providers/imap/camel-imap-message-cache.c:377
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "�ѱK�l�󥢱ѡC"
@@ -10399,7 +10617,7 @@ msgstr "�ˬd�Ҧ���Ƨ��̪��s�l��"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1031
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
 msgid "Folders"
 msgstr "��Ƨ�"
 
@@ -10441,7 +10659,7 @@ msgstr "�Χ@Ū�����x�s�l��� IMAP ���A���C"
 # mail/mail-config.glade.h:52
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:87
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
 msgid "Password"
 msgstr "�K�X"
 
@@ -10451,19 +10669,19 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "�o�ӿﶵ�N�|�ϥ�²�����K�X�s�u�� IMAP ���A���C"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/imap/camel-imap-store.c:423
+#: camel/providers/imap/camel-imap-store.c:433
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP ���A�� %s"
 
 # camel/camel-remote-store.c:195
-#: camel/providers/imap/camel-imap-store.c:425
+#: camel/providers/imap/camel-imap-store.c:435
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "�� %3$s �W�� %2$s �� %1$s �A��"
 
 # camel/camel-remote-store.c:252
-#: camel/providers/imap/camel-imap-store.c:544
+#: camel/providers/imap/camel-imap-store.c:554
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
@@ -10472,17 +10690,16 @@ msgstr "�s�u�w����"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:557
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/pop3/camel-pop3-store.c:183
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "����s�u�� %s (�� %d)�G %s"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap/camel-imap-store.c:606
-#: camel/providers/imap/camel-imap-store.c:637
+#: camel/providers/imap/camel-imap-store.c:616
+#: camel/providers/imap/camel-imap-store.c:647
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10490,7 +10707,7 @@ msgstr ""
 "�ǰe�ϥΪ̦W�ٮɵo�Ϳ��~�G%s"
 
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:607
+#: camel/providers/imap/camel-imap-store.c:617
 #: camel/providers/pop3/camel-pop3-store.c:213
 #, fuzzy
 msgid "SSL/TLS extension not supported."
@@ -10498,41 +10715,49 @@ msgstr "��ʤ��䴩"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:638
+#: camel/providers/imap/camel-imap-store.c:648
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "������ѡC"
 
+# 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/imap/camel-imap-store.c:891
+#, fuzzy, c-format
+msgid "The folder %s no longer exists"
+msgstr "��Ƨ� `%s' ���s�b�C"
+
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:1025
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP ���A�� %s ���䴩�ҭn�D���������O %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:471
+#: camel/providers/imap/camel-imap-store.c:1035
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "���䴩�������O %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:903
+#: camel/providers/imap/camel-imap-store.c:1059
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s �п�J %s@%s �� IMAP �K�X"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:918
-#: camel/providers/smtp/camel-smtp-transport.c:512
+#: camel/providers/imap/camel-imap-store.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:517
 msgid "You didn't enter a password."
 msgstr "�z�S����J�K�X�C"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:947
+#: camel/providers/imap/camel-imap-store.c:1103
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10545,32 +10770,38 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1269
-#: camel/providers/imap/camel-imap-store.c:1388
+#: camel/providers/imap/camel-imap-store.c:1426
+#: camel/providers/imap/camel-imap-store.c:1563
 #, c-format
 msgid "No such folder %s"
 msgstr "�S���o�Ӹ�Ƨ� %s"
 
-#: camel/providers/imap/camel-imap-store.c:1656
+#: camel/providers/imap/camel-imap-store.c:1750
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it containes the character \"%c\""
+msgstr "��Ƨ��W�٤���]�t����r���C"
+
+#: camel/providers/imap/camel-imap-store.c:1788
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "����Ƨ��ä����\�]�t�l��Ƨ�"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:351
+#: camel/providers/local/camel-local-folder.c:352
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:355
-#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:356
+#: camel/providers/local/camel-local-folder.c:359
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "�L�k�}�� mailbox�G%s�G %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:362
+#: camel/providers/local/camel-local-folder.c:363
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -10594,7 +10825,10 @@ msgid "Local delivery"
 msgstr "���a�ݱH�e"
 
 #: camel/providers/local/camel-local-provider.c:66
-msgid "For retrieving local mail from standard mbox formated spools."
+#, fuzzy
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "�Ω�ۼз� mbox �榡�Ƶ{���������a�ݶl��C"
 
 # camel/providers/imap/camel-imap-provider.c:57
@@ -10629,13 +10863,13 @@ msgstr "�з� Unix mbox �Ƶ{��"
 #: camel/providers/local/camel-local-provider.c:102
 #, fuzzy
 msgid ""
-"For reading and storing local mail in standard mbox spool files.\n"
+"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 "�Ω�Ū�����x�s���a믶l���з� mbox �Ƶ{���ɮסC"
 
 # camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:229
 #: camel/providers/local/camel-spool-store.c:110
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10649,44 +10883,44 @@ msgstr "�x�s�ڥؿ� %s ���O�X�k���ؿ�"
 
 # 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:236
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:237
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "�L�k���o��Ƨ��G%s�G%s"
 
 # camel/providers/local/camel-local-store.c:173
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr "���a�ݪ��s�x�S������X"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:197
+#: camel/providers/local/camel-local-store.c:198
 #, c-format
 msgid "Local mail file %s"
 msgstr "���a�ݶl���ɮ� %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:301 mail/mail-local.c:908
+#: camel/providers/local/camel-local-store.c:302 mail/mail-local.c:910
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "����N��Ƨ� %s ���s�R�W�� %s�G %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-local-store.c:358
+#: camel/providers/local/camel-local-store.c:359
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
 
 # camel/providers/local/camel-local-store.c:279
-#: camel/providers/local/camel-local-store.c:379
+#: camel/providers/local/camel-local-store.c:380
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "����R����Ƨ��K�n�ɮ� `%s'�G %s"
 
 # camel/providers/local/camel-local-store.c:289
-#: camel/providers/local/camel-local-store.c:389
+#: camel/providers/local/camel-local-store.c:390
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "����R����Ƨ������ɮ� `%s'�G %s"
@@ -10771,7 +11005,7 @@ msgstr ""
 # 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:102
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #, c-format
 msgid "Folder `%s' does not exist."
@@ -10820,31 +11054,31 @@ msgstr "�L�k���y��Ƨ� `%s'�G%s"
 
 # camel/providers/local/camel-maildir-summary.c:405
 # camel/providers/local/camel-maildir-summary.c:526
-#: camel/providers/local/camel-maildir-summary.c:408
-#: camel/providers/local/camel-maildir-summary.c:531
+#: camel/providers/local/camel-maildir-summary.c:416
+#: camel/providers/local/camel-maildir-summary.c:545
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "�L�k�}�� maildir �ؿ����|�G%s: %s"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: camel/providers/local/camel-maildir-summary.c:525
+#: camel/providers/local/camel-maildir-summary.c:539
 #, fuzzy
 msgid "Checking folder consistency"
 msgstr "�ˬd�s�l��"
 
 # mail/mail-ops.c:992
-#: camel/providers/local/camel-maildir-summary.c:629
+#: camel/providers/local/camel-maildir-summary.c:640
 #, fuzzy
 msgid "Checking for new messages"
 msgstr "���y�s�l��"
 
 # camel/camel-filter-driver.c:690
 # camel/camel-filter-driver.c:788
-#: camel/providers/local/camel-maildir-summary.c:718
+#: camel/providers/local/camel-maildir-summary.c:729
 #: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:582
-#: camel/providers/local/camel-mbox-summary.c:672
+#: camel/providers/local/camel-mbox-summary.c:583
+#: camel/providers/local/camel-mbox-summary.c:673
 #: camel/providers/local/camel-spool-summary.c:145
 #, fuzzy
 msgid "Storing folder"
@@ -10903,7 +11137,7 @@ msgid "Message construction failed: Corrupt mailbox?"
 msgstr "�l�󵲺c���~�G�l���� mailbox �H"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-store.c:95
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -10913,7 +11147,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:110
-#: camel/providers/local/camel-mbox-store.c:111
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -10924,16 +11158,16 @@ msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: camel/providers/local/camel-mbox-store.c:120
-#: camel/providers/local/camel-mbox-store.c:147
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ���O�@�ӦX�k���ɮסC"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/local/camel-mbox-store.c:139
-#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -10943,7 +11177,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "��Ƨ� `%s' �������ɮסC�ҥH���R���C"
@@ -10965,14 +11199,14 @@ msgstr "�a�����Ƨ� %2$s �� %1$ld �o���Y�����l����R���~"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-summary.c:452
+#: camel/providers/local/camel-mbox-summary.c:453
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "�L�k���o��Ƨ��G%s�G%s"
 
 # camel/providers/local/camel-mbox-store.c:94
-#: camel/providers/local/camel-mbox-summary.c:587
-#: camel/providers/local/camel-mbox-summary.c:677
+#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:678
 #: camel/providers/local/camel-spool-summary.c:150
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -10981,7 +11215,7 @@ msgstr ""
 "%s"
 
 # camel/providers/local/camel-mbox-summary.c:524
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
 #: camel/providers/local/camel-spool-summary.c:169
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -10989,20 +11223,20 @@ msgstr "�L�k�}�ҼȦs mailbox�G%s"
 
 # camel/providers/local/camel-mbox-summary.c:635
 # camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-mbox-summary.c:611
-#: camel/providers/local/camel-mbox-summary.c:773
+#: camel/providers/local/camel-mbox-summary.c:612
+#: camel/providers/local/camel-mbox-summary.c:774
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "���������ӷ���Ƨ� %s �G %s"
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:620
+#: camel/providers/local/camel-mbox-summary.c:621
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "�L�k�����Ȧs��Ƨ��G %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:632
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
@@ -11011,34 +11245,34 @@ msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
 # 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:715
-#: camel/providers/local/camel-mbox-summary.c:723
-#: camel/providers/local/camel-mbox-summary.c:912
-#: camel/providers/local/camel-mbox-summary.c:920
+#: camel/providers/local/camel-mbox-summary.c:716
+#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:913
+#: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "�K�n�P��Ƨ�����աA�Y�ϸg�L�P�B"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-mbox-summary.c:848
 #: camel/providers/local/camel-spool-summary.c:332
 #, c-format
 msgid "Unknown error: %s"
 msgstr "���������~�G%s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-summary.c:882
+#: camel/providers/local/camel-mbox-summary.c:883
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
 
 # camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-mbox-summary.c:973
+#: camel/providers/local/camel-mbox-summary.c:974
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "�g�J�Ȧs�l�c�ɵo�Ϳ��~�G%s"
 
 # camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-mbox-summary.c:990
+#: camel/providers/local/camel-mbox-summary.c:991
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "�g�J�Ȧs�l�c���ѡG%s�G%s"
@@ -11216,7 +11450,7 @@ msgid "Operation failed: %s"
 msgstr "��ʤw����"
 
 # camel/providers/pop3/camel-pop3-folder.c:149
-#: camel/providers/pop3/camel-pop3-folder.c:272
+#: camel/providers/pop3/camel-pop3-folder.c:245
 msgid "Retrieving POP summary"
 msgstr "���^ POP ���K�n"
 
@@ -11224,28 +11458,28 @@ msgstr "���^ POP ���K�n"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/pop3/camel-pop3-folder.c:285
-#: camel/providers/pop3/camel-pop3-folder.c:446
-#: camel/providers/pop3/camel-pop3-folder.c:505
-#: camel/providers/pop3/camel-pop3-folder.c:522
+#: camel/providers/pop3/camel-pop3-folder.c:261
+#: camel/providers/pop3/camel-pop3-folder.c:426
+#: camel/providers/pop3/camel-pop3-folder.c:485
+#: camel/providers/pop3/camel-pop3-folder.c:502
 #, fuzzy
 msgid "User cancelled"
 msgstr "��ʤw����"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:263
 #, fuzzy, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "�L�k���o��Ƨ��G%s�G%s"
 
 # mail/message-browser.c:199
-#: camel/providers/pop3/camel-pop3-folder.c:325
+#: camel/providers/pop3/camel-pop3-folder.c:305
 msgid "Expunging deleted messages"
 msgstr "�M�ŧR�����l��"
 
 # camel/providers/pop3/camel-pop3-folder.c:292
-#: camel/providers/pop3/camel-pop3-folder.c:420
+#: camel/providers/pop3/camel-pop3-folder.c:400
 #, c-format
 msgid "No message with uid %s"
 msgstr "�S���l��㦳�o�� uid %s"
@@ -11253,7 +11487,7 @@ msgstr "�S���l��㦳�o�� uid %s"
 # camel/providers/pop3/camel-pop3-folder.c:296
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:427
+#: camel/providers/pop3/camel-pop3-folder.c:407
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "���� POP �l�� %d"
@@ -11265,10 +11499,10 @@ msgstr "���� POP �l�� %d"
 # 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/pop3/camel-pop3-folder.c:448
-#: camel/providers/pop3/camel-pop3-folder.c:507
-#: camel/providers/pop3/camel-pop3-folder.c:514
-#: camel/providers/pop3/camel-pop3-folder.c:524
+#: camel/providers/pop3/camel-pop3-folder.c:428
+#: camel/providers/pop3/camel-pop3-folder.c:487
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:504
 #, fuzzy, c-format
 msgid "Cannot get message %s: %s"
 msgstr ""
@@ -11276,7 +11510,7 @@ msgstr ""
 " %s"
 
 # camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:514
+#: camel/providers/pop3/camel-pop3-folder.c:494
 #, fuzzy
 msgid "Unknown reason"
 msgstr "����������"
@@ -11299,7 +11533,7 @@ msgstr "�R�� %s �ѫ᪺�l��"
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:86
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
 msgid "POP"
 msgstr "POP"
 
@@ -11327,6 +11561,13 @@ msgstr ""
 "�o�ӿﶵ�N�|�ϥΥ[�K���K�X�g�� APOP �q�T��w�s�u�� POP ���A���C���L�N����A��"
 "�n�ٯ���䴩�A�����Ҧ��ϥΪ̨����������@�w�i��C"
 
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/pop3/camel-pop3-store.c:183
+#, fuzzy, c-format
+msgid "Could not connect to POP server %s (port %d): %s"
+msgstr "����s�u�� %s (�� %d)�G %s"
+
 # camel/providers/pop3/camel-pop3-store.c:379
 #: camel/providers/pop3/camel-pop3-store.c:212
 #: camel/providers/pop3/camel-pop3-store.c:241
@@ -11340,15 +11581,16 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-store.c:322
 #: camel/providers/pop3/camel-pop3-store.c:351
 #, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
+msgid "Could not connect to POP server %s"
 msgstr "������s�u�� %s �W�� POP ���A���C"
 
 # camel/providers/pop3/camel-pop3-store.c:409
 #: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:495
+#: camel/providers/pop3/camel-pop3-store.c:498
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 "������s�u�� POP ���A���C\n"
 "���ҭn�D�����Ҿ���S���䴩�C"
@@ -11356,38 +11598,39 @@ msgstr ""
 # camel/providers/imap/camel-imap-command.c:240
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, fuzzy, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "IMAP ���O���ѡG %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:419
-msgid "SASL Protocol error"
+#: camel/providers/pop3/camel-pop3-store.c:420
+#, c-format
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-# shell/e-storage.c:467
-#: camel/providers/pop3/camel-pop3-store.c:434
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:436
 #, fuzzy, c-format
-msgid "I/O Error: %s"
-msgstr "��X/�J���~"
+msgid "Failed to authenticate on POP server %s: %s"
+msgstr "�L�k���ҵn�J KPOP ���A���G%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:455
+#: camel/providers/pop3/camel-pop3-store.c:458
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%s �п�J�� %s@%s �� POP3 �K�X"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:507
-#: camel/providers/pop3/camel-pop3-store.c:511
-#, c-format
+#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:514
+#, fuzzy, c-format
 msgid ""
-"Unable to connect to POP server.\n"
+"Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 "������s�u�� POP ���A���C\n"
 "�ǰe�K�X�ɵo�Ϳ��~�G%s"
 
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:604
+#: camel/providers/pop3/camel-pop3-store.c:609
 #, c-format
 msgid "No such folder `%s'."
 msgstr "�S���o�Ӹ�Ƨ� `%s'�C"
@@ -11395,7 +11638,7 @@ msgstr "�S���o�Ӹ�Ƨ� `%s'�C"
 # 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:111
+#: mail/mail-config.glade.h:109
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11425,42 +11668,42 @@ msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "�L�k�t�~�A�Ұʤ@�� sendmail ��{�G %s�G�l��L�k�ǰe"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/sendmail/camel-sendmail-transport.c:165
+#: camel/providers/sendmail/camel-sendmail-transport.c:164
 #, c-format
 msgid "Could not send message: %s"
 msgstr "�l��L�k�ǰe�G %s"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:163
-#: camel/providers/sendmail/camel-sendmail-transport.c:178
+#: camel/providers/sendmail/camel-sendmail-transport.c:186
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail �^�������T�� %s�G�l��L�k�ǰe"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:170
-#: camel/providers/sendmail/camel-sendmail-transport.c:185
+#: camel/providers/sendmail/camel-sendmail-transport.c:193
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "������� %s�G �l��L�k�ǰe�C"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:175
-#: camel/providers/sendmail/camel-sendmail-transport.c:190
+#: camel/providers/sendmail/camel-sendmail-transport.c:198
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail �ѩ󪬪p %d �����G �l��L�k�ǰe�C"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:247
-#: camel/providers/sendmail/camel-sendmail-transport.c:204
+#: camel/providers/sendmail/camel-sendmail-transport.c:212
 msgid "sendmail"
 msgstr "sendmail"
 
 # camel/providers/sendmail/camel-sendmail-transport.c:249
-#: camel/providers/sendmail/camel-sendmail-transport.c:206
+#: camel/providers/sendmail/camel-sendmail-transport.c:214
 msgid "Mail delivery via the sendmail program"
 msgstr "�g�� sendmail �{���ǰe�l��"
 
 # 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:102
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11594,15 +11837,15 @@ msgstr "�{�����ҥ���"
 msgid "Authentication required"
 msgstr "�n�D����"
 
-# camel/providers/smtp/camel-smtp-transport.c:313
-#: camel/providers/smtp/camel-smtp-transport.c:302
-#, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
-msgstr "�Ǧ^ Welcome �o�Ϳ��~�G%s�G �i��O�D�Y�������~"
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:299
+#, fuzzy
+msgid "Welcome response error"
+msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/smtp/camel-smtp-transport.c:337
-#: camel/providers/smtp/camel-smtp-transport.c:379
+#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
@@ -11610,37 +11853,37 @@ msgstr ""
 "�ǰe�ϥΪ̦W�ٮɵo�Ϳ��~�G%s"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/smtp/camel-smtp-transport.c:338
+#: camel/providers/smtp/camel-smtp-transport.c:341
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "��Ƨ��n���w�g�l���åB����_��C"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: camel/providers/smtp/camel-smtp-transport.c:352
+#: camel/providers/smtp/camel-smtp-transport.c:355
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "RSET ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:367
+#: camel/providers/smtp/camel-smtp-transport.c:370
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:356
-#: camel/providers/smtp/camel-smtp-transport.c:461
+#: camel/providers/smtp/camel-smtp-transport.c:466
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP ���A�� %s ���䴩�ҭn�D���������O %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:395
-#: camel/providers/smtp/camel-smtp-transport.c:499
+#: camel/providers/smtp/camel-smtp-transport.c:504
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%s �п�J %s@%s �� SMTP �K�X"
 
 # camel/providers/smtp/camel-smtp-transport.c:418
-#: camel/providers/smtp/camel-smtp-transport.c:520
+#: camel/providers/smtp/camel-smtp-transport.c:525
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -11652,109 +11895,109 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:645
+#: camel/providers/smtp/camel-smtp-transport.c:658
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP ���A�� %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/smtp/camel-smtp-transport.c:647
+#: camel/providers/smtp/camel-smtp-transport.c:660
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "�g�� %s �ǰe SMTP �l��"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:678
 msgid "Cannot send message: sender address not valid."
 msgstr "�L�k�ǰe�l��G�H��̪��a�}�L�ġC"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:670 mail/mail-ops.c:607
+#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "�ǰe�l��"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:681
+#: camel/providers/smtp/camel-smtp-transport.c:697
 msgid "Cannot send message: no recipients defined."
 msgstr "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:691
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "�L�k�ǰe�l��G�S�����Ѧ���̡C"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:841
+#: camel/providers/smtp/camel-smtp-transport.c:861
 msgid "SMTP Greeting"
 msgstr "SMTP �ﱵ"
 
-# camel/providers/smtp/camel-smtp-transport.c:676
-#: camel/providers/smtp/camel-smtp-transport.c:872
-#, c-format
-msgid "HELO request timed out: %s: non-fatal"
-msgstr "HELO ���n�D�O�ɡG%s�G �D�Y�������~"
-
-# camel/providers/smtp/camel-smtp-transport.c:695
+# camel/providers/smtp/camel-smtp-transport.c:1024
 #: camel/providers/smtp/camel-smtp-transport.c:892
-#, c-format
-msgid "HELO response error: %s: non-fatal"
-msgstr "�Ǧ^ HELO ���^�����~�G%s�G �D�Y�������~"
+#, fuzzy, c-format
+msgid "HELO request timed out: %s"
+msgstr "RSET ���n�D�O�ɡG%s"
+
+# camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:913
+#, fuzzy
+msgid "HELO response error"
+msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # mail/mail-config.glade.h:10
-#: camel/providers/smtp/camel-smtp-transport.c:940
+#: camel/providers/smtp/camel-smtp-transport.c:979
 msgid "SMTP Authentication"
 msgstr "SMTP ����"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: camel/providers/smtp/camel-smtp-transport.c:946
+#: camel/providers/smtp/camel-smtp-transport.c:985
 msgid "Error creating SASL authentication object."
 msgstr "�إ� SASL ���Ҫ���ɵo�Ϳ��~�C"
 
 # camel/providers/smtp/camel-smtp-transport.c:743
 # camel/providers/smtp/camel-smtp-transport.c:755
-#: camel/providers/smtp/camel-smtp-transport.c:963
-#: camel/providers/smtp/camel-smtp-transport.c:975
+#: camel/providers/smtp/camel-smtp-transport.c:1002
+#: camel/providers/smtp/camel-smtp-transport.c:1014
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:764
-#: camel/providers/smtp/camel-smtp-transport.c:984
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "AUTH request failed."
 msgstr "AUTH �n�D���ѡC"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1084
 msgid "Bad authentication response from server.\n"
 msgstr "�q���A���Ǧ^�����T���Ҫ��^���C\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: camel/providers/smtp/camel-smtp-transport.c:1070
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 
 # camel/providers/smtp/camel-smtp-transport.c:854
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1129
 #, fuzzy
 msgid "MAIL FROM response error"
 msgstr "�Ǧ^ MAIL FROM ���^�����~�G%s�G �l��L�k�ǰe"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:1108
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCPT TO ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1124
+#: camel/providers/smtp/camel-smtp-transport.c:1175
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: camel/providers/smtp/camel-smtp-transport.c:1160
+#: camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA ���n�D�O�ɡG%s�G�l��L�k�ǰe"
@@ -11763,75 +12006,76 @@ msgstr "DATA ���n�D�O�ɡG%s�G�l��L�k�ǰe"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1174
+#: camel/providers/smtp/camel-smtp-transport.c:1237
 #, fuzzy
 msgid "DATA response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:963
 # camel/providers/smtp/camel-smtp-transport.c:981
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1277
+#: camel/providers/smtp/camel-smtp-transport.c:1300
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr "DATA �ǰe�O�ɡG�l��ǰe����G%s�G�l��L�k�ǰe"
 
 # camel/camel-sasl-kerberos4.c:218
 # camel/providers/imap/camel-imap-store.c:433
-#: camel/providers/smtp/camel-smtp-transport.c:1246
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy
 msgid "DATA termination response error"
 msgstr "�Ӧۦ��A�������}�\�i�^���C"
 
 # camel/providers/smtp/camel-smtp-transport.c:1024
-#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1343
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1283
+#: camel/providers/smtp/camel-smtp-transport.c:1363
 #, fuzzy
 msgid "RSET response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
-# camel/providers/smtp/camel-smtp-transport.c:1066
-#: camel/providers/smtp/camel-smtp-transport.c:1306
-#, c-format
-msgid "QUIT request timed out: %s: non-fatal"
-msgstr "QUIT ���n�D�O�ɡG %s�G�D�Y�������~"
+# camel/providers/smtp/camel-smtp-transport.c:743
+# camel/providers/smtp/camel-smtp-transport.c:755
+#: camel/providers/smtp/camel-smtp-transport.c:1386
+#, fuzzy, c-format
+msgid "QUIT request timed out: %s"
+msgstr "AUTH ���n�D�O�ɡG%s"
 
 # camel/providers/smtp/camel-smtp-transport.c:1043
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1406
 #, fuzzy
 msgid "QUIT response error"
 msgstr "�Ǧ^ RSET ���^�����~�G %s"
 
 # composer/e-msg-composer-attachment-bar.c:95
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:102
 msgid "1 byte"
 msgstr "1 �줸"
 
 # composer/e-msg-composer-attachment-bar.c:97
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%u bytes"
 msgstr "%u �줸"
 
 # composer/e-msg-composer-attachment-bar.c:104
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:111
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
 # composer/e-msg-composer-attachment-bar.c:108
-#: composer/e-msg-composer-attachment-bar.c:114
+#: composer/e-msg-composer-attachment-bar.c:115
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
 # composer/e-msg-composer-attachment-bar.c:112
-#: composer/e-msg-composer-attachment-bar.c:118
+#: composer/e-msg-composer-attachment-bar.c:119
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
@@ -11839,36 +12083,36 @@ msgstr "%.1fG"
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:152
+#: composer/e-msg-composer-attachment-bar.c:378 mail/mail-display.c:220
 msgid "attachment"
 msgstr "����"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:523
 msgid "Remove selected items from the attachment list"
 msgstr "�����w��ܪ����[�ɮ�"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:537
+#: composer/e-msg-composer-attachment-bar.c:554
 msgid "Add attachment..."
 msgstr "�s�W����..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:538
+#: composer/e-msg-composer-attachment-bar.c:555
 msgid "Attach a file to the message"
 msgstr "���[�ɮצܶl��"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, fuzzy, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "�L�k���o��Ƨ��G%s�G%s"
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, fuzzy, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "`%s' ���O�@�ӦX�k���ɮסC"
@@ -11889,86 +12133,99 @@ msgid "MIME type:"
 msgstr "MIME ���O�G"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:156
+#: composer/e-msg-composer-select-file.c:163
 msgid "Suggest automatic display of attachment"
 msgstr "��ij�۰���ܪ���"
 
 # composer/e-msg-composer-hdrs.c:324
-#: composer/e-msg-composer-hdrs.c:340
+#: composer/e-msg-composer-hdrs.c:344
 msgid "Click here for the address book"
 msgstr "���o�̷s�W�ؿ��A��"
 
-# composer/e-msg-composer-hdrs.c:355
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:370
-msgid "From:"
-msgstr "�H��̡G"
-
 # composer/e-msg-composer-hdrs.c:361
 #.
 #. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:376
+#: composer/e-msg-composer-hdrs.c:378
 msgid "Reply-To:"
 msgstr "�^�Цa�}�G"
 
+# composer/e-msg-composer-hdrs.c:355
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:389
+msgid "From:"
+msgstr "�H��̡G"
+
 # composer/e-msg-composer-hdrs.c:372
 #.
-#. * Subject:
+#. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:387
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Subject:"
 msgstr "�D���G"
 
 # composer/e-msg-composer-hdrs.c:386
-#: composer/e-msg-composer-hdrs.c:401
+#: composer/e-msg-composer-hdrs.c:409
 msgid "To:"
 msgstr "����̡G"
 
 # composer/e-msg-composer-hdrs.c:387
-#: composer/e-msg-composer-hdrs.c:402
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the recipients of the message"
 msgstr "��J�l�󪺦����"
 
 # composer/e-msg-composer-hdrs.c:390
-#: composer/e-msg-composer-hdrs.c:405
+#: composer/e-msg-composer-hdrs.c:413
 msgid "Cc:"
 msgstr "�ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:391
-#: composer/e-msg-composer-hdrs.c:406
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "��J�l��ƥ��������"
 
 # composer/e-msg-composer-hdrs.c:394
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Bcc:"
 msgstr "�K��ƥ��G"
 
 # composer/e-msg-composer-hdrs.c:395
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:418
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "��J�l��K��ƥ��������"
 
+# addressbook/gui/component/addressbook-config.c:409
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:425
+#, fuzzy
+msgid "Post To:"
+msgstr "�q�T��(_P)�G"
+
 # composer/e-msg-composer-attachment-bar.c:421
 # ui/evolution-message-composer.xml.h:2
-#: composer/e-msg-composer-select-file.c:267
+#: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "���[�ɮ�"
 
 # mail/mail-crypto.c:59
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:514
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "�L�k�إߤ@�� PGP ñ�W�奻�C"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:782
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -11978,39 +12235,39 @@ msgstr ""
 "%s"
 
 # widgets/misc/e-messagebox.c:159
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1157
 msgid "Warning!"
 msgstr "ĵ�i�I"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1161
 msgid "File exists, overwrite?"
 msgstr "�ɮפw�s�b�A�л\���H"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1052
+#: composer/e-msg-composer.c:1183
 #, c-format
 msgid "Error saving file: %s"
 msgstr "�x�s�ɮ׮ɵo�Ϳ��~�G%s"
 
 # composer/e-msg-composer.c:805
-#: composer/e-msg-composer.c:1071
+#: composer/e-msg-composer.c:1203
 #, c-format
 msgid "Error loading file: %s"
 msgstr "���J�ɮ׮ɵo�Ϳ��~�G%s"
 
 # composer/e-msg-composer.c:785
-#: composer/e-msg-composer.c:1102
+#: composer/e-msg-composer.c:1236
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "�s���ɮ׮ɵo�Ϳ��~�G%s"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1110
+#: composer/e-msg-composer.c:1244
 msgid "Unable to retrieve message from editor"
 msgstr "�L�k�q�s�边���o�l��"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1117
+#: composer/e-msg-composer.c:1251
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -12020,7 +12277,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: composer/e-msg-composer.c:1124
+#: composer/e-msg-composer.c:1258
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -12030,7 +12287,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: composer/e-msg-composer.c:1133
+#: composer/e-msg-composer.c:1267
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -12040,7 +12297,7 @@ msgstr ""
 " %s"
 
 # importers/pine-importer.c:705
-#: composer/e-msg-composer.c:1235
+#: composer/e-msg-composer.c:1367
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -12049,7 +12306,7 @@ msgstr ""
 "�O�_���ձN���_��H"
 
 # composer/e-msg-composer.c:941
-#: composer/e-msg-composer.c:1381
+#: composer/e-msg-composer.c:1516
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -12060,57 +12317,52 @@ msgstr ""
 "�O�_���N�ܧ��x�s�H"
 
 # mail/mail-ops.c:1154
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1523
 msgid "Warning: Modified Message"
 msgstr "ĵ�i�G�ܧ�L���l��"
 
 # composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1553
 msgid "Open file"
 msgstr "�}���ɮ�"
 
-# ui/evolution-message-composer.xml.h:49
-#: composer/e-msg-composer.c:1569
-msgid "Insert File"
-msgstr "���J�ɮ�"
-
-#: composer/e-msg-composer.c:1841
+#: composer/e-msg-composer.c:1925
 msgid ""
 "Can't set default signature for this account. Maybe accounts were modified "
 "meanwhile?"
 msgstr ""
 
 # mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:1878
+#: composer/e-msg-composer.c:1962
 #, fuzzy
 msgid "Signature:"
 msgstr "ñ�W�ɡG"
 
-#: composer/e-msg-composer.c:1919 mail/mail-account-gui.c:1211
+#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
 # mail/mail-accounts.c:121
 # mail/mail-accounts.c:165
-#: composer/e-msg-composer.c:1931
+#: composer/e-msg-composer.c:2015
 #, fuzzy
 msgid "Set as default"
 msgstr "(�w�])"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2129 composer/e-msg-composer.c:2742
+#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
 msgid "Compose a message"
 msgstr "�s��l��"
 
-#: composer/e-msg-composer.c:2759
+#: composer/e-msg-composer.c:2814
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 msgstr ""
 
 # composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:2785 composer/e-msg-composer.c:2840
+#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -12119,9 +12371,9 @@ msgstr ""
 "�L�k�إ߶l��s������A�]���z�����b\n"
 "�l�󤸥󤺳]�w���󨭥��ҩ��C"
 
-#: composer/e-msg-composer.c:3665
+#: composer/e-msg-composer.c:3846
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be editted.)"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
@@ -12199,8 +12451,8 @@ msgstr "�D�����]�t"
 
 # mail/mail-callbacks.c:1144
 # mail/mail-display.c:96
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2295
-#: mail/mail-display.c:122
+#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -12210,12 +12462,11 @@ msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#. Remember the password?
-#: e-util/e-passwords.c:363 mail/mail-session.c:269
+#: e-util/e-passwords.c:363
 msgid "Remember this password"
 msgstr "�O�U�o�ӱK�X"
 
-#: e-util/e-passwords.c:365 mail/mail-session.c:270
+#: e-util/e-passwords.c:365
 msgid "Remember this password for the remainder of this session"
 msgstr ""
 
@@ -12353,155 +12604,104 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "�~"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "�~"
+#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: mail/mail-config.glade.h:185
+msgid "seconds"
+msgstr "��"
 
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "��"
+#: filter/filter-datespec.c:71
+msgid "minute"
+msgstr "��"
 
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "��"
+#: filter/filter-datespec.c:72
+msgid "hour"
+msgstr "�p��"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74
 msgid "week"
 msgstr "�g"
 
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:74 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "�g"
 
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "�p��"
+#: filter/filter-datespec.c:75
+msgid "month"
+msgstr "��"
 
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "��"
+#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+msgid "months"
+msgstr "��"
 
-#: filter/filter-datespec.c:86 mail/mail-config.glade.h:190
-msgid "seconds"
-msgstr "��"
+#: filter/filter-datespec.c:76
+msgid "year"
+msgstr "�~"
+
+#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+msgid "years"
+msgstr "�~"
 
-#: filter/filter-datespec.c:194
+#: filter/filter-datespec.c:174
 #, fuzzy
 msgid "You have forgotten to choose a date."
 msgstr "���C�z�ѤF�������C"
 
-#: filter/filter-datespec.c:196
-#, fuzzy
-msgid "You have chosen an invalid date."
-msgstr "���C�z����F�@�ӵL�Ī�����C"
-
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
-msgstr ""
-"�l�󪺤���N�Q���\n"
-"�L�׹L�o������ε�����Ƨ��}��\n"
-"���ɶ�����C"
-
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
-msgstr ""
-"�l�����N�|�P�z�b�o�̫��w��\n"
-"����ɶ��@����C"
-
-#: filter/filter-datespec.c:334
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-"�l�����N�|�P�۹��L�o������\n"
-"���ɶ��@����F\n"
-"�Ҧp�A\"�@�g�e\"�C"
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr "�ثe�ɶ�"
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
-msgstr "�z�ҫ��w���ɶ�"
-
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr "�۹��ثe�ɶ����ɮt"
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr "���"
+#: filter/filter-datespec.c:269
+msgid "<click here to select a date>"
+msgstr "<���o�ؿ�ܤ��>"
 
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
+#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
 msgid "now"
 msgstr "�{�b"
 
-#: filter/filter-datespec.c:575
-msgid " ago"
-msgstr "�e"
+# calendar/gui/print.c:1093
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:279
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%a %d %b %Y"
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#. 1 (minute|day|...) ago (singular time ago)
+#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#, fuzzy, c-format
+msgid "%d %s ago"
 msgstr "�e"
 
-# mail/message-list.c:977
-#: filter/filter-datespec.c:711 mail/message-list.c:1103
-msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
-msgstr "<���o�ؿ�ܤ��>"
+#: filter/filter-datespec.c:407
+msgid "Select a time to compare against"
+msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
+#: filter/filter-editor.c:132 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "�W�h"
 
-#: filter/filter-file.c:176
+#: filter/filter-file.c:178
 msgid "You must specify a file name"
 msgstr ""
 
 # camel/providers/local/camel-mbox-store.c:119
 # camel/providers/local/camel-mbox-store.c:146
-#: filter/filter-file.c:186
+#: filter/filter-file.c:190
 #, fuzzy, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "�Ƶ{�� `%s' ���s�b�Τ��O�@�ӦX�k���ɮ�"
 
 # ui/evolution-message-composer.xml.h:12
-#: filter/filter-file.c:286
+#: filter/filter-file.c:307
 #, fuzzy
 msgid "Choose a file"
 msgstr "�}������"
 
 #. and now for the action area
-#: filter/filter-filter.c:488
+#: filter/filter-filter.c:513
 msgid "Then"
 msgstr "�M��"
 
-#: filter/filter-filter.c:502
+#: filter/filter-filter.c:527
 msgid "Add action"
 msgstr "�s�W�ʧ@"
 
-#: filter/filter-folder.c:147
+#: filter/filter-folder.c:149
 #, fuzzy
 msgid ""
 "You forgot to choose a folder.\n"
@@ -12511,12 +12711,12 @@ msgstr ""
 "�Ц^�Y���w�@�Ӧ��Ī���Ƨ��@�������l�󤧥ΡC"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:228 filter/vfolder-rule.c:366
-#: mail/mail-account-gui.c:1443 mail/mail-account-gui.c:1457
+#: filter/filter-folder.c:237 filter/vfolder-rule.c:391
+#: mail/mail-account-gui.c:1463 mail/mail-account-gui.c:1477
 msgid "Select Folder"
 msgstr "��ܸ�Ƨ�"
 
-#: filter/filter-input.c:198
+#: filter/filter-input.c:200
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -12525,93 +12725,174 @@ msgstr ""
 "���W���ܦ��������~ '%s'�G\n"
 "%s"
 
-#: filter/filter-label.c:158
-msgid "You must specify a label name"
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
+#: mail/mail-config.glade.h:62
+msgid "Important"
+msgstr "���n"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#. red
+#: filter/filter-label.c:137 mail/mail-config.c:76
+#: mail/mail-config.glade.h:135
+#, fuzzy
+msgid "Work"
+msgstr "���b�u�@"
+
+#. orange
+#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+msgid "Personal"
 msgstr ""
 
-#: filter/filter-part.c:518 shell/evolution-test-component.c:49
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#. forest green
+#: filter/filter-label.c:139 mail/mail-config.c:78
+#: mail/mail-config.glade.h:126
+#, fuzzy
+msgid "To Do"
+msgstr "�h��"
+
+# calendar/gui/event-editor-dialog.glade.h:33
+#. blue
+#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#, fuzzy
+msgid "Later"
+msgstr "����"
+
+#: filter/filter-part.c:545 shell/evolution-test-component.c:49
 msgid "Test"
 msgstr "����"
 
 # ui/evolution.xml.h:3
-#: filter/filter-rule.c:217
+#: filter/filter-rule.c:223
 #, fuzzy
 msgid "You must name this filter."
 msgstr "���o�Ӹ�Ƨ����W��"
 
-#: filter/filter-rule.c:721
+#: filter/filter-rule.c:764
 msgid "Rule name: "
 msgstr "�W�h�W�١G"
 
-#: filter/filter-rule.c:725
+#: filter/filter-rule.c:768
 msgid "Untitled"
 msgstr "���R�W"
 
-#: filter/filter-rule.c:742
+#: filter/filter-rule.c:785
 msgid "If"
 msgstr "�p�G"
 
-#: filter/filter-rule.c:760
+#: filter/filter-rule.c:803
 msgid "Execute actions"
 msgstr "����ʧ@"
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:807
 msgid "if all criteria are met"
 msgstr "�p�G��������ŦX"
 
-#: filter/filter-rule.c:769
+#: filter/filter-rule.c:812
 msgid "if any criteria are met"
 msgstr "�p�G�������ŦX"
 
-#: filter/filter-rule.c:780
+#: filter/filter-rule.c:823
 msgid "Add criterion"
 msgstr "�s�W����"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "incoming"
 msgstr "���e"
 
-#: filter/filter-rule.c:865
+#: filter/filter-rule.c:908
 msgid "outgoing"
 msgstr "�~�H"
 
 #: filter/filter.glade.h:1
+msgid "Compare against"
+msgstr "���"
+
+#: filter/filter.glade.h:2
 msgid "Edit Filters"
 msgstr "�s��W�h"
 
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:3
 msgid "Edit VFolders"
 msgstr "�s�������Ƨ�"
 
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "���e"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:6
 msgid "Outgoing"
 msgstr "�~�H"
 
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:7
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"�l�����N�|�P�z�b�o�̫��w��\n"
+"����ɶ��@����C"
+
+#: filter/filter.glade.h:9
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"�l�����N�|�P�۹��L�o������\n"
+"���ɶ��@����F\n"
+"�Ҧp�A\"�@�g�e\"�C"
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"�l�����N�|�P�z�b�o�̫��w��\n"
+"����ɶ��@����C"
+
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
 msgid "Virtual Folders"
 msgstr "������Ƨ�"
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:18
+msgid "a time relative to the current time"
+msgstr "�۹��ثe�ɶ����ɮt"
+
+#: filter/filter.glade.h:19
+msgid "ago"
+msgstr "�e"
+
+#: filter/filter.glade.h:25
 msgid "specific folders only"
 msgstr "�u�����w��Ƨ�"
 
-#: filter/filter.glade.h:12
+#: filter/filter.glade.h:26
+msgid "the current time"
+msgstr "�ثe�ɶ�"
+
+#: filter/filter.glade.h:27
+#, fuzzy
+msgid "the time you specify"
+msgstr "�z�ҫ��w���ɶ�"
+
+#: filter/filter.glade.h:28
 msgid "vFolder Sources"
 msgstr "������Ƨ��ӷ�"
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:30
 msgid "with all active remote folders"
 msgstr "�]�A�����i�Ϊ����ݸ�Ƨ�"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:31
 msgid "with all local and active remote folders"
 msgstr "�]�A�������a�ݤΥi�Ϊ����ݸ�Ƨ�"
 
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:32
 msgid "with all local folders"
 msgstr "�]�A�������a�ݪ���Ƨ�"
 
@@ -12639,44 +12920,43 @@ msgstr "���[�ɮ�"
 msgid "Beep"
 msgstr "������"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
 #: filter/libfilter-i18n.h:7
-#, fuzzy
-msgid "Command"
-msgstr "���q�q��"
-
-#: filter/libfilter-i18n.h:8
 msgid "contains"
 msgstr "�]�t"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "�ƻs�ܸ�Ƨ�"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "������"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "�e����"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "�w�R��"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "does not contain"
 msgstr "���]�t"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "does not end with"
 msgstr "���O�H���׵�"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 msgid "does not exist"
 msgstr "���s�b"
 
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "���s�b"
+
 #: filter/libfilter-i18n.h:17
 msgid "does not sound like"
 msgstr "������"
@@ -12698,86 +12978,84 @@ msgid "ends with"
 msgstr "�H���׵�"
 
 #: filter/libfilter-i18n.h:22
-msgid "Execute Shell Command"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
 msgid "Exist"
 msgstr "�s�b"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:23
 msgid "exists"
 msgstr "�s�b"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "���y"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
-msgid "Important"
-msgstr "���n"
-
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is"
 msgstr "�O"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 #, fuzzy
 msgid "is after"
 msgstr "�O���᪺"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "is before"
 msgstr "�O���e��"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 #, fuzzy
 msgid "is Flagged"
 msgstr "���мm��"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "is greater than"
 msgstr "�j��"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "is less than"
 msgstr "�p��"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "is not"
 msgstr "���O"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 #, fuzzy
 msgid "is not Flagged"
 msgstr "���мm��"
 
-#: filter/libfilter-i18n.h:36 mail/folder-browser.c:1713
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
 msgid "Label"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "�l��C��"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "�l�󤺮e"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "�l�����Y"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "���ܸ�Ƨ�"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+# addressbook/gui/widgets/e-addressbook-view.c:613
+#: filter/libfilter-i18n.h:40
+#, fuzzy
+msgid "Pipe Message to Shell Command"
+msgstr "�ǰe�l�󵹳s���H"
+
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
 #: filter/libfilter-i18n.h:41
@@ -12785,7 +13063,7 @@ msgstr "���ܸ�Ƨ�"
 msgid "Play Sound"
 msgstr "���񭵮ġG"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:63
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
 msgid "Read"
 msgstr "�\Ū"
 
@@ -12801,61 +13079,93 @@ msgstr "���W���ܦ��۰t"
 msgid "Replied to"
 msgstr "�^��"
 
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "�Ӱȹq��"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "�j��"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "�p��"
+
 # mail/message-list.c:1081
-#: filter/libfilter-i18n.h:46 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "�ؼ�"
 
-#: filter/libfilter-i18n.h:47 mail/mail-callbacks.c:1600
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
 msgid "Sender"
 msgstr "�H���"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "�]�w���A"
 
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: filter/libfilter-i18n.h:52
+#, fuzzy
+msgid "Shell Command"
+msgstr "���q�q��"
+
 # addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "�j�p (kB)"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:54
 msgid "sounds like"
 msgstr "����"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "�ӷ��b��"
 
-#: filter/libfilter-i18n.h:52
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "���w���Y"
 
-#: filter/libfilter-i18n.h:53
+#: filter/libfilter-i18n.h:57
 msgid "starts with"
 msgstr "�H���}�l"
 
-#: filter/libfilter-i18n.h:55
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "����B�z"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:56 mail/mail-format.c:917
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "�D��"
 
-#: filter/rule-editor.c:179
+#: filter/libfilter-i18n.h:61
+#, fuzzy
+msgid "Unset Status"
+msgstr "�]�w���A"
+
+#: filter/rule-editor.c:180
 msgid "Rules"
 msgstr "�W�h"
 
-#: filter/rule-editor.c:286
+#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#, c-format
+msgid "Rule name '%s' is not unique, choose another"
+msgstr ""
+
+#: filter/rule-editor.c:299
 msgid "Add Rule"
 msgstr "�s�W�W�h"
 
-#: filter/rule-editor.c:361
+#: filter/rule-editor.c:388
 msgid "Edit Rule"
 msgstr "�s��W�h"
 
@@ -12864,12 +13174,12 @@ msgid "Score Rules"
 msgstr "�ؼгW�h"
 
 # ui/evolution.xml.h:3
-#: filter/vfolder-rule.c:204
+#: filter/vfolder-rule.c:206
 #, fuzzy
 msgid "You must name this vfolder."
 msgstr "���o�Ӹ�Ƨ����W��"
 
-#: filter/vfolder-rule.c:213
+#: filter/vfolder-rule.c:215
 #, fuzzy
 msgid "You need to to specify at least one folder as a source."
 msgstr "���C�z�ݭn���w�ܤ֤@�Ӹ�Ƨ������ӷ��C"
@@ -12880,25 +13190,25 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution ���b�פJ�z�¦��� Elm �l��"
 
 # shell/e-shell-importer.c:363
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1221
+#: importers/elm-importer.c:96 importers/netscape-importer.c:1227
 #: importers/pine-importer.c:101
 msgid "Importing..."
 msgstr "�פJ..."
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1223
+#: importers/elm-importer.c:98 importers/netscape-importer.c:1229
 #: importers/pine-importer.c:103
 msgid "Please wait"
 msgstr "�еy��"
 
 # shell/e-shell-importer.c:371
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1801
+#: importers/elm-importer.c:169 importers/netscape-importer.c:1807
 #: importers/pine-importer.c:365
 #, c-format
 msgid "Importing %s as %s"
 msgstr "�פJ %s �� %s"
 
 # mail/mail-ops.c:599
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1910
+#: importers/elm-importer.c:375 importers/netscape-importer.c:1916
 #: importers/pine-importer.c:471
 #, c-format
 msgid "Scanning %s"
@@ -12907,9 +13217,9 @@ msgstr "���y %s"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2121
+#: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:229
+#: mail/folder-browser-ui.c:327
 msgid "Mail"
 msgstr "�l��"
 
@@ -12973,7 +13283,7 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1220
+#: importers/netscape-importer.c:1226
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution ���b�פJ�z�¦��� Netscape ���"
 
@@ -12983,40 +13293,40 @@ msgstr "Evolution ���b�פJ�z�¦��� Netscape ���"
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
 #. Fill in the new fields
-#: importers/netscape-importer.c:1865 mail/mail-ops.c:1075
-#: shell/e-local-storage.c:179
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: shell/e-local-storage.c:183
 #, fuzzy
 msgid "Trash"
 msgstr "�g�ը��"
 
 # camel/providers/local/camel-local-store.c:183
-#: importers/netscape-importer.c:2021
+#: importers/netscape-importer.c:2027
 #, fuzzy
 msgid "Scanning mail filters"
 msgstr "���a�ݶl���ɮ� %s"
 
 # camel/providers/imap/camel-imap-folder.c:364
-#: importers/netscape-importer.c:2031 importers/pine-importer.c:570
+#: importers/netscape-importer.c:2037 importers/pine-importer.c:570
 msgid "Scanning directory"
 msgstr "���y�ؿ�"
 
-#: importers/netscape-importer.c:2040
+#: importers/netscape-importer.c:2046
 msgid "Starting import"
 msgstr "�}�l�פJ"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: importers/netscape-importer.c:2126
+#: importers/netscape-importer.c:2132
 msgid "Settings"
 msgstr "�]�w"
 
-#: importers/netscape-importer.c:2131
+#: importers/netscape-importer.c:2137
 #, fuzzy
 msgid "Mail Filters"
 msgstr "�s��W�h"
 
 # importers/netscape-importer.c:847
-#: importers/netscape-importer.c:2154
+#: importers/netscape-importer.c:2160
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13119,12 +13429,12 @@ msgid "Font Preferences"
 msgstr "�D�g���ʬ��|(_N)"
 
 # mail/mail-config.glade.h:6
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14 mail/mail-config.glade.h:68
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 #, fuzzy
 msgid "Mail Accounts"
 msgstr "�b��"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:70
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
 msgid "Mail Preferences"
 msgstr ""
 
@@ -13179,68 +13489,93 @@ msgstr "���e..."
 msgid "Change this folder's properties"
 msgstr "�ܧ�o�Ӹ�Ƨ������e"
 
-#: mail/component-factory.c:767
+#: mail/component-factory.c:763
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
 # mail/mail-callbacks.c:202
-#: mail/component-factory.c:929
+#: mail/component-factory.c:928
 msgid "You have not set a mail transport method"
 msgstr "�z�S���]�w�l��ǰe��k"
 
-#: mail/component-factory.c:951
+#: mail/component-factory.c:950
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
 # mail/mail-ops.c:1154
-#: mail/component-factory.c:957
+#: mail/component-factory.c:956
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "ĵ�i�G�ܧ�L���l��"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:998
+#: mail/component-factory.c:997
 msgid "New Mail Message"
 msgstr "�s�W�l��"
 
 # ui/evolution-mail.xml.h:109
-#: mail/component-factory.c:998 ui/evolution-mail-global.xml.h:16
+#: mail/component-factory.c:997
 msgid "_Mail Message"
 msgstr "�l��T��(_M)"
 
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: mail/component-factory.c:998
+#, fuzzy
+msgid "Compose a new mail message"
+msgstr "�s��l��"
+
+# widgets/misc/e-messagebox.c:180
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "New Message Post"
+msgstr "�U�@�ʶl��"
+
+# mail/mail-callbacks.c:1407
+#: mail/component-factory.c:1006
+#, fuzzy
+msgid "_Post Message"
+msgstr "�W�@�ʶl��"
+
+# ui/evolution-mail.xml.h:109
+#: mail/component-factory.c:1007
+#, fuzzy
+msgid "Post a new mail message"
+msgstr "�s�W�l��"
+
 # mail/component-factory.c:337
-#: mail/component-factory.c:1025
+#: mail/component-factory.c:1035
 msgid "Cannot initialize Evolution's mail component."
 msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1034
+#: mail/component-factory.c:1044
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/component-factory.c:337
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1050
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "�����l�� Evolution �� mail ����C"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/component-factory.c:1236 mail/component-factory.c:1267
+#: mail/component-factory.c:1275 mail/component-factory.c:1305
 #, fuzzy
 msgid "Connecting..."
 msgstr "���b�s�u�ܦ��A��..."
 
 # mail/component-factory.c:410
-#: mail/component-factory.c:1277
+#: mail/component-factory.c:1316
 msgid "Cannot register storage with shell"
 msgstr "����H�� shell ���U�x�s�Ŷ�"
 
 # mail/folder-browser-factory.c:196
-#: mail/folder-browser-ui.c:344
+#: mail/folder-browser-ui.c:440
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "\"%s\" �����e"
@@ -13248,12 +13583,12 @@ msgstr "\"%s\" �����e"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/folder-browser-ui.c:346
+#: mail/folder-browser-ui.c:442
 msgid "Properties"
 msgstr "���e"
 
 # mail/mail-display.c:236
-#: mail/folder-browser.c:308 mail/mail-display.c:334 mail/mail-display.c:840
+#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "����إ߼Ȧs�ؿ��G %s"
@@ -13308,47 +13643,47 @@ msgid "Create _Virtual Folder From Search..."
 msgstr "�q�l��إߵ�����Ƨ�(_V)"
 
 # mail/folder-browser.c:653
-#: mail/folder-browser.c:1649
+#: mail/folder-browser.c:1651
 msgid "VFolder on _Subject"
 msgstr "�q�D���إߵ�����Ƨ�(_S)"
 
 # mail/folder-browser.c:656
-#: mail/folder-browser.c:1650
+#: mail/folder-browser.c:1652
 msgid "VFolder on Se_nder"
 msgstr "�q�H��̫إߵ�����Ƨ�(_N)"
 
 # mail/folder-browser.c:659
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1653
 msgid "VFolder on _Recipients"
 msgstr "�q����̫إߵ�����Ƨ�(_R)"
 
 # mail/folder-browser.c:662
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1654
 msgid "VFolder on Mailing _List"
 msgstr "�q�l��M��إߵ�����Ƨ�(_L)"
 
 # mail/folder-browser.c:668
-#: mail/folder-browser.c:1656
+#: mail/folder-browser.c:1658
 msgid "Filter on Sub_ject"
 msgstr "�q�D���إ߳W�h(_J)"
 
 # mail/folder-browser.c:671
-#: mail/folder-browser.c:1657
+#: mail/folder-browser.c:1659
 msgid "Filter on Sen_der"
 msgstr "�q�H��̫إ߳W�h(_D)"
 
 # mail/folder-browser.c:674
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1660
 msgid "Filter on Re_cipients"
 msgstr "����̳W�h(_C)"
 
 # mail/folder-browser.c:677
-#: mail/folder-browser.c:1659 mail/folder-browser.c:1989
+#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
 msgid "Filter on _Mailing List"
 msgstr "�q�l��M��إ߳W�h(_M)"
 
 # ui/evolution-mail.xml.h:66
-#: mail/folder-browser.c:1677 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1679
 msgid "_Edit as New Message..."
 msgstr "�s�謰�s�l��(_E)..."
 
@@ -13356,34 +13691,34 @@ msgstr "�s�謰�s�l��(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1681
 msgid "_Print"
 msgstr "�C�L(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/folder-browser.c:1683 ui/evolution-mail-message.xml.h:109
+#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "�^�бH���(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1684 ui/evolution-mail-message.xml.h:73
+#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "�^�ЦܲM��(_A)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:72
+#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "�^�ЩҦ��H(_A)"
 
 # mail/folder-browser.c:701
-#: mail/folder-browser.c:1686
+#: mail/folder-browser.c:1688
 msgid "_Forward"
 msgstr "��H(_F)"
 
-#: mail/folder-browser.c:1690
+#: mail/folder-browser.c:1692
 msgid "Follo_w Up..."
 msgstr ""
 
@@ -13391,91 +13726,91 @@ msgstr ""
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/folder-browser.c:1691
+#: mail/folder-browser.c:1693
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "�w����"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1694
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "�M��"
 
 # mail/folder-browser.c:704
 #. separator here?
-#: mail/folder-browser.c:1696 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "�Хܦ��w�\Ū(_K)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1697
+#: mail/folder-browser.c:1699
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "�Хܦ����\Ū(_n)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1698
+#: mail/folder-browser.c:1700
 msgid "Mark as _Important"
 msgstr "�Хܦ����n(_I)"
 
 # mail/folder-browser.c:706
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1701
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "�Хܦ������n(_O)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1706
 #, fuzzy
 msgid "U_ndelete"
 msgstr "�_��(_U)"
 
 # mail/folder-browser.c:711
-#: mail/folder-browser.c:1708
+#: mail/folder-browser.c:1710
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
 # mail/folder-browser.c:713
-#: mail/folder-browser.c:1709 ui/evolution-addressbook.xml.h:35
+#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "�_�s�ܸ�Ƨ�(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/folder-browser.c:1717
+#: mail/folder-browser.c:1719
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "�s�W�ǰe�̨�ؿ��A��"
 
 # mail/folder-browser.c:727
-#: mail/folder-browser.c:1721
+#: mail/folder-browser.c:1723
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "�M�ιL�o��"
 
 # mail/folder-browser.c:731
-#: mail/folder-browser.c:1725
+#: mail/folder-browser.c:1727
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "�q�l��إ߳W�h(_L)"
 
 # mail/folder-browser.c:871
-#: mail/folder-browser.c:1990
+#: mail/folder-browser.c:1985
 #, fuzzy
 msgid "VFolder on M_ailing List"
 msgstr "�l��M�檺������Ƨ�"
 
 # mail/folder-browser.c:873
-#: mail/folder-browser.c:1992
+#: mail/folder-browser.c:1987
 #, fuzzy, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "�l��M�檺�L�o�� (%s)"
 
 # mail/folder-browser.c:874
-#: mail/folder-browser.c:1993
+#: mail/folder-browser.c:1988
 #, fuzzy, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "�l��M�檺������Ƨ� (%s)"
@@ -13553,62 +13888,56 @@ msgid "mh"
 msgstr "mh"
 
 # mail/mail-account-editor.c:105
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:106
 msgid "You have not filled in all of the required information."
 msgstr "�z�S����J�Ҧ���������T�C"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr "Evolution �s�D�s�边"
-
-# mail/mail-account-editor.c:173
-#. give our dialog an OK button and title
 #: mail/mail-account-editor.c:159
 msgid "Evolution Account Editor"
 msgstr "Evolution �b���s�边"
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:741 mail/mail-config.glade.h:163
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
 msgid "_Host:"
 msgstr "�D��(_H)�G"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:745 mail/mail-config.glade.h:133
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
 #, fuzzy
 msgid "User_name:"
 msgstr "�ϥΪ̦W��(_U)�G"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:749 mail/mail-config.glade.h:171
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
 msgid "_Path:"
 msgstr "���|(_P)�G"
 
-#: mail/mail-account-gui.c:1818
+#: mail/mail-account-gui.c:1843
 msgid "You may not create two accounts with the same name."
 msgstr "�z����άۦP���W�٫إߨ�ӱb���C"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: mail/mail-accounts.c:215
+#: mail/mail-accounts.c:224
 msgid "Are you sure you want to delete this account?"
 msgstr "�z�T�w�n�R���o�ӱb���H"
 
 # shell/e-shortcuts-view.c:265
-#: mail/mail-accounts.c:219
+#: mail/mail-accounts.c:228
 msgid "Don't delete"
 msgstr "���n�R��"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-accounts.c:222
+#: mail/mail-accounts.c:231
 msgid "Really delete account?"
 msgstr "�T�w�R���b���H"
 
 # mail/mail-accounts.c:197
-#: mail/mail-accounts.c:359 mail/mail-accounts.c:393
+#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
 #: mail/mail-composer-prefs.c:638 mail/mail-composer-prefs.c:667
 #: mail/mail-composer-prefs.c:697
 msgid "Disable"
@@ -13616,32 +13945,26 @@ msgstr "����"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-accounts.c:361 mail/mail-accounts.c:395
+#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
 #: mail/mail-composer-prefs.c:640 mail/mail-composer-prefs.c:665
 #: mail/mail-composer-prefs.c:697
 msgid "Enable"
 msgstr "�ҥ�"
 
-# mail/mail-accounts.c:418
-# mail/mail-accounts.c:422
-#: mail/mail-accounts.c:638 mail/mail-accounts.c:642
-msgid "Are you sure you want to delete this news account?"
-msgstr "�z�T�w�n�R���o�ӷs�D�b���H"
-
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-accounts.c:737 mail/mail-accounts.etspec.h:2
+#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
 #: mail/mail-config.glade.h:53
 msgid "Enabled"
 msgstr "�w�ҥ�"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-accounts.c:738 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "�b��(_A)�G"
 
-#: mail/mail-accounts.c:739 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "�i�h���U"
@@ -13653,34 +13976,34 @@ msgid "Mail to %s"
 msgstr "�l��e�� %s"
 
 # mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:223
+#: mail/mail-autofilter.c:242
 #, c-format
 msgid "Subject is %s"
 msgstr "�D���O %s"
 
 # mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:239
+#: mail/mail-autofilter.c:258
 #, c-format
 msgid "Mail from %s"
 msgstr "�l��Ӧ� %s "
 
 # mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:295
+#: mail/mail-autofilter.c:275
 #, c-format
 msgid "%s mailing list"
 msgstr "%s �l��C��"
 
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:344 mail/mail-autofilter.c:364
+#: mail/mail-autofilter.c:327
 msgid "Add Filter Rule"
 msgstr "�s�W�L�o���W�h"
 
-#: mail/mail-autofilter.c:413
+#: mail/mail-autofilter.c:376
 msgid "The following filter rule(s):\n"
 msgstr ""
 
-#: mail/mail-autofilter.c:419
+#: mail/mail-autofilter.c:382
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -13689,7 +14012,7 @@ msgid ""
 msgstr ""
 
 # mail/mail-callbacks.c:93
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:101
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -13702,7 +14025,7 @@ msgstr ""
 "�O�_�{�b�]�w�H"
 
 # mail/mail-callbacks.c:146
-#: mail/mail-callbacks.c:144
+#: mail/mail-callbacks.c:150
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -13711,7 +14034,7 @@ msgstr ""
 "�~�i�H�}�l���g�l��C"
 
 # mail/mail-callbacks.c:158
-#: mail/mail-callbacks.c:158
+#: mail/mail-callbacks.c:164
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -13720,7 +14043,7 @@ msgstr ""
 "�~�i�H�}�l���g�l��C"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:196
+#: mail/mail-callbacks.c:202
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -13728,13 +14051,13 @@ msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: mail/mail-callbacks.c:211
+#: mail/mail-callbacks.c:217
 #, fuzzy
 msgid "Send anyway?"
 msgstr "�ǰe�q�l�l��"
 
 # mail/mail-callbacks.c:235
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:259
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -13742,18 +14065,18 @@ msgstr ""
 "�l��W�S���D���C\n"
 "�O�_���M�N�l��e�X�H"
 
-#: mail/mail-callbacks.c:297
+#: mail/mail-callbacks.c:303
 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 ""
 "�]���z�e�H���s���H�M��]�w�����òM�檺�a�}�A�o�Ӷl��u�|�]�t�K��ƥ�����̡C"
 
-#: mail/mail-callbacks.c:301
+#: mail/mail-callbacks.c:307
 msgid "This message contains only Bcc recipients."
 msgstr "�o�Ӷl��u�]�t�K��ƥ�����̡C"
 
-#: mail/mail-callbacks.c:305
+#: mail/mail-callbacks.c:311
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -13763,17 +14086,12 @@ msgstr ""
 "�L�צp�󳣭n�ǰe�ܡH"
 
 # mail/mail-callbacks.c:308
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:475
 msgid "You must specify recipients in order to send this message."
 msgstr "�z�������w����̤~�i�e�X�l��C"
 
-# mail/mail-callbacks.c:351
-#: mail/mail-callbacks.c:499
-msgid "You must configure an account before you can send this email."
-msgstr "�z�����n���]�w�@�ӱb���~�i�H�ǰe�o�ʶl��C"
-
 # composer/e-msg-composer.c:877
-#: mail/mail-callbacks.c:644
+#: mail/mail-callbacks.c:739
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -13783,32 +14101,32 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/mail-callbacks.c:1025
+#: mail/mail-callbacks.c:1154
 msgid "an unknown sender"
 msgstr "�������H���"
 
-#: mail/mail-callbacks.c:1029
+#: mail/mail-callbacks.c:1158
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "�b %a, %Y-%m-%d %H:%M, %%s �g�D�G"
 
 # mail/mail-callbacks.c:850
-#: mail/mail-callbacks.c:1481 mail/message-browser.c:131
+#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "�N�l�󲾦�"
 
 # mail/mail-callbacks.c:852
-#: mail/mail-callbacks.c:1483 mail/message-browser.c:133
+#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "�N�l��ƻs��"
 
 # mail/mail-callbacks.c:1017
-#: mail/mail-callbacks.c:2139
+#: mail/mail-callbacks.c:2352
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "�z�T�w�n�s����� %d �ʶl��H"
 
 # mail/mail-callbacks.c:1039
-#: mail/mail-callbacks.c:2164
+#: mail/mail-callbacks.c:2377
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -13817,7 +14135,7 @@ msgstr ""
 "��Z��Ƨ������l��C"
 
 # mail/mail-callbacks.c:1073
-#: mail/mail-callbacks.c:2203
+#: mail/mail-callbacks.c:2416
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -13826,45 +14144,45 @@ msgstr ""
 "�����l�󭫶ǡC"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-callbacks.c:2217
+#: mail/mail-callbacks.c:2430
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "�z�T�w�n���s�ǰe���� %d �ʶl��H"
 
 # mail/mail-callbacks.c:1106
-#: mail/mail-callbacks.c:2243
+#: mail/mail-callbacks.c:2456
 msgid "No Message Selected"
 msgstr "�S����w�l��"
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: mail/mail-callbacks.c:2288 mail/mail-display.c:118
+#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "�л\�ɮסH"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-callbacks.c:2342
+#: mail/mail-callbacks.c:2555
 msgid "Save Message As..."
 msgstr "�t�s�l��..."
 
 # mail/mail-callbacks.c:1190
-#: mail/mail-callbacks.c:2344
+#: mail/mail-callbacks.c:2557
 msgid "Save Messages As..."
 msgstr "�t�s�l��..."
 
 # ui/evolution-mail.xml.h:23
-#: mail/mail-callbacks.c:2415
+#: mail/mail-callbacks.c:2626
 #, fuzzy
 msgid "Go to next folder with unread messages?"
 msgstr "��ܤU�@�ʥ��\Ū���l��"
 
-#: mail/mail-callbacks.c:2422
+#: mail/mail-callbacks.c:2633
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2665
+#: mail/mail-callbacks.c:2876
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -13877,7 +14195,7 @@ msgstr ""
 "�T�w�M���o�Ƕl��H"
 
 # mail/mail-callbacks.c:1349
-#: mail/mail-callbacks.c:2778
+#: mail/mail-callbacks.c:2989
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -13888,32 +14206,32 @@ msgstr ""
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/mail-callbacks.c:2790
+#: mail/mail-callbacks.c:3001
 msgid "Filters"
 msgstr "�L�o��"
 
 # camel/camel-filter-driver.c:748
-#: mail/mail-callbacks.c:2833
+#: mail/mail-callbacks.c:3045
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "���b������ %d / %d �ʶl��"
 
 # mail/mail-callbacks.c:1407
-#: mail/mail-callbacks.c:2886
+#: mail/mail-callbacks.c:3098
 msgid "Print Message"
 msgstr "�C�L�l��"
 
-#: mail/mail-callbacks.c:2913
+#: mail/mail-callbacks.c:3125
 msgid "US-Letter"
 msgstr ""
 
 # mail/mail-callbacks.c:1454
-#: mail/mail-callbacks.c:2952
+#: mail/mail-callbacks.c:3164
 msgid "Printing of message failed"
 msgstr "�C�L�l�󥢱�"
 
 # mail/mail-callbacks.c:1549
-#: mail/mail-callbacks.c:3139 mail/mail-callbacks.c:3179
+#: mail/mail-callbacks.c:3335
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "�z�T�w�n�ηs�����}�ҥ��� %d �ʶl��H"
@@ -13938,7 +14256,7 @@ msgid "Please specify a valid script name"
 msgstr ""
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2835
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
 #, fuzzy
 msgid "Unnamed"
 msgstr "���R�W���s���H"
@@ -13962,20 +14280,21 @@ msgstr "_HTML ñ�W�ɡG"
 
 # mail/mail-config-druid.c:99
 #: mail/mail-config-druid.c:146
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
 "�Цb�U����J�z���W�٤ιq�l�a�}�C\"�i���\" ����줣�@�w�n��A\n"
 "���D�z�Ʊ�b�e�X���l�󤺥]�t�o�Ǹ�T�C"
 
 # mail/mail-config-druid.c:101
 #: mail/mail-config-druid.c:148
+#, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�п�J�H�U����z��������A������ơC�p�G�z���M���A���p���z���t��\n"
 "�޲z���κ����A�Ȩ����ӡC"
@@ -13986,24 +14305,23 @@ msgstr "�Цb�U�C�ﶵ�����"
 
 # mail/mail-config-druid.c:105
 #: mail/mail-config-druid.c:152
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 "�п�J�H�U����z���H����A������ơC�p�G�z���M���A���p���z���t��\n"
 "�޲z���κ����A�Ȩ����ӡC"
 
 # mail/mail-config-druid.c:107
 #: mail/mail-config-druid.c:154
+#, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 "�z�t���h�w�����l��]�w�C�z���Ѫ������ҩ��A������A����\n"
 "�H�e�l��ǰe�覡�N�|��z���@�� Evolution �l��b���C\n"
@@ -14012,52 +14330,23 @@ msgstr ""
 
 # mail/mail-config-druid.c:445
 #. set window title
-#: mail/mail-config-druid.c:627
+#: mail/mail-config-druid.c:632
 msgid "Evolution Account Assistant"
 msgstr "Evolution �b���U�z"
 
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#. red
-#: mail/mail-config.c:76 mail/mail-config.glade.h:139
-#, fuzzy
-msgid "Work"
-msgstr "���b�u�@"
-
-#. orange
-#: mail/mail-config.c:77 mail/mail-config.glade.h:88
-msgid "Personal"
-msgstr ""
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#. forest green
-#: mail/mail-config.c:78 mail/mail-config.glade.h:130
-#, fuzzy
-msgid "To Do"
-msgstr "�h��"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#. blue
-#: mail/mail-config.c:79 mail/mail-config.glade.h:66
-#, fuzzy
-msgid "Later"
-msgstr "����"
-
 # mail/mail-config.glade.h:3
-#: mail/mail-config.c:625
+#: mail/mail-config.c:632
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "�b��"
 
-#: mail/mail-config.c:2555
+#: mail/mail-config.c:2629
 msgid "Checking Service"
 msgstr "�ˬd�A��"
 
 # mail/mail-config.c:1213
 # mail/mail-config.c:1216
-#: mail/mail-config.c:2633 mail/mail-config.c:2637
+#: mail/mail-config.c:2707 mail/mail-config.c:2711
 msgid "Connecting to server..."
 msgstr "���b�s�u�ܦ��A��..."
 
@@ -14375,286 +14664,270 @@ msgid "Loading Images"
 msgstr "���J�Ϥ�(_I)"
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:68
 msgid "Mail Configuration"
 msgstr "�l��]�w"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Mailbox location"
 msgstr "�H�c��m"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:71
 #, fuzzy
 msgid "Message Composer"
 msgstr "�l��"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Display"
 msgstr "�˵��l��(_M)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Microsoft"
 msgstr "�K�Jù�����"
 
-# addressbook/gui/component/addressbook-config.c:148
-#: mail/mail-config.glade.h:75
-msgid "NNTP Server:"
-msgstr "NNTP ���A���G"
-
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "New Mail Notification"
 msgstr "�l��]�w"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
-#: mail/mail-config.glade.h:79
-#, fuzzy
-msgid "News Servers"
-msgstr "�s�D�o�e���A��(_N)"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:78
 msgid "On Screen fonts"
 msgstr ""
 
 # mail/mail-config.glade.h:47
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:79
 msgid "Optional Information"
 msgstr "�����T"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "����(_Z)�G"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP �_�� ID�G"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:86
 msgid "Pick a color"
 msgstr "����C��"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "���ǰe���l��u�����w�K��ƥ�����̮���ܴ���(_B)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "�۷��������p"
 
 # ui/evolution-addressbook.xml.h:11
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "�C�L��w���s���H"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:90
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Quote original message"
 msgstr "����}�Ҷl��"
 
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:92
 msgid "Quoted"
 msgstr "�ޥ�"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Re_member this password"
 msgstr "�O�U�o�ӱK�X"
 
 # composer/e-msg-composer-hdrs.c:361
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "�^�Цa�}�G"
 
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:98 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "�����l��"
 
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:96
 #, fuzzy
 msgid "Receiving _Options"
 msgstr "�����l��ﶵ"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Remember this _password"
 msgstr "�O�U�o�ӱK�X"
 
 # mail/mail-config.glade.h:61
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:98
 msgid "Required Information"
 msgstr "�Ҷ���T"
 
+# mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Restore Defaults"
+msgstr "�w�]��(_F)"
+
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "S_ecurity"
 msgstr "�w����"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Secure MIME (S/MIME)"
 msgstr "�w���� MIME"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:103
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:105
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
 # mail/mail-config.glade.h:63
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Select PGP program"
 msgstr "��� PGP �G����"
 
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:110 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "�ǰe�l��"
 
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:110
 #, fuzzy
 msgid "Sent _messages folder:"
 msgstr "�ǰe�l���Ƨ��G"
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:111
 msgid "Sent and Draft Messages"
 msgstr "�ǰe�P��Z�l��"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "���A���n�D����(_A)"
 
 # mail/mail-config.glade.h:71
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:113
 msgid "Server Configuration"
 msgstr "���A���]�w"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Server _Type: "
 msgstr "���A�����O�G"
 
 # ui/evolution.xml.h:62
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "�\��"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Signature #1"
 msgstr "ñ�W�ɡG"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #2"
 msgstr "ñ�W�ɡG"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
-#: mail/mail-config.glade.h:120
-msgid "Source"
-msgstr "�ӷ�"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/mail-config.glade.h:121
-msgid "Source Information"
-msgstr "�ӷ���T"
-
 # addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "�˦��W�١G"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:119
 msgid "Spell Checking Language"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:120
 msgid "Spell _Checking"
 msgstr ""
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:121
 msgid "Standard Unix mbox"
 msgstr "�з� Unix mbox"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:122
 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:129
+#: mail/mail-config.glade.h:125
 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:131
+#: mail/mail-config.glade.h:127
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "�ܼ�"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:131
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14664,229 +14937,229 @@ msgstr ""
 "\n"
 "�� \"�U�@�B\" �}�l�C"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "XEmacs"
 msgstr "�F"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML ñ�W�ɡG"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:139
 msgid "_Always load images off the net"
 msgstr "�û��ۺ����U���Ϥ�(_A)"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "_Always sign outgoing messages when using this account"
 msgstr "���ϥγo�ӱb���ɥû��b�H�e���l��W�[ñ"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:141
 #, fuzzy
 msgid "_Authentication Type: "
 msgstr "�������O�G"
 
 # mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "_Authentication type: "
 msgstr "�������O�G"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "_Automatically check for new mail"
 msgstr "�۰��ˬd�s�l��C�j(_A)"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:144
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "�۰��ˬd�s�l��C�j(_A)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:145
 msgid "_Beep when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:146
 #, fuzzy
 msgid "_Certificate ID:"
 msgstr "�Ү� ID�G"
 
 # mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:147
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "�R����Ƨ�"
 
 # calendar/gui/e-day-view.c:3179
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Default signature:"
 msgstr "�R��ñ�W�ɥH�~�������ƥ�"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Defaults"
 msgstr "�w�]��(_F)"
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:151
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid "_Enable"
 msgstr "�ҥ�"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:154
 msgid "_Fixed-width:"
 msgstr ""
 
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "_Forward style:"
 msgstr "��H�覡"
 
 # mail/mail-config.glade.h:31
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Full name:"
 msgstr "���W(_F)�G"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_HTML Mail"
 msgstr "HTML �榡�l��"
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Identity"
 msgstr "����"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:161
 msgid "_Load images if sender is in addressbook"
 msgstr "�p�G�H��̦b�ؿ��A�Ȥ��N���J�Ϥ�(_L)"
 
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "�]���w�]�b��(_D)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "�Хܶl�󬰤w�\Ū(_M)"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:164
 msgid "_Name:"
 msgstr "�W��(_N)�G"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:165
 msgid "_Never load images off the net"
 msgstr "�û����ۺ����U���Ϥ�(_N)"
 
 # mail/mail-config.glade.h:50
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:166
 msgid "_PGP binary path:"
 msgstr "_PGP �G���X���|�G"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:168
 msgid "_Play sound file when new mail arrives"
 msgstr ""
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "���ǰe�S���D�����l�����ܴ���(_E)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "���ǰe�S���D�����l�����ܴ���(_E)"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:171
 #, fuzzy
 msgid "_Receiving Mail"
 msgstr "�����l��"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Reply style:"
 msgstr "�����^��"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:173
 msgid "_Restore defaults"
 msgstr ""
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Script:"
 msgstr "�w��(_S)"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:179 ui/evolution-message-composer.xml.h:54
+#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "�w��(_S)"
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Sending Mail"
 msgstr "�ǰe�l��"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Show animated images"
 msgstr "��ܮɶ���"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Signatures"
 msgstr "ñ�W��(_S)�G"
 
 # mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use secure connection (SSL):"
 msgstr "�ϥΦw���s�� (_SSL)"
 
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:180
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "�ܼ�"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_every"
 msgstr "�C"
 
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "color"
 msgstr " ��m"
@@ -14894,15 +15167,11 @@ msgstr " ��m"
 # 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:187
+#: mail/mail-config.glade.h:183
 msgid "description"
 msgstr "�y�z"
 
-#: mail/mail-config.glade.h:189
-msgid "newswindow1"
-msgstr "�s�D���� 1"
-
-#: mail/mail-config.glade.h:191
+#: mail/mail-config.glade.h:186
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -14932,232 +15201,243 @@ msgid "Could not create a S/MIME decode context."
 msgstr "�L�k�إߤ@�� S/MIME �ѱK�奻�C"
 
 # mail/mail-display.c:196
-#: mail/mail-display.c:279
+#: mail/mail-display.c:319
 msgid "Save Attachment"
 msgstr "�x�s���[�ɮ�"
 
 # mail/mail-tools.c:145
-#: mail/mail-display.c:344
+#: mail/mail-display.c:384
 #, fuzzy, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "�L�k�إ߼Ȧs mbox `%s'�G%s"
 
-# mail/mail-display.c:297
-#: mail/mail-display.c:390
-msgid "Save to Disk..."
-msgstr "�x�s�ܺϺ�..."
+# mail/mail-display.c:196
+#: mail/mail-display.c:430
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "�x�s���[�ɮ�"
 
 # mail/mail-display.c:301
-#: mail/mail-display.c:391
+#: mail/mail-display.c:431
 msgid "View Inline"
 msgstr "�˵� Inline"
 
 # mail/mail-display.c:299
-#: mail/mail-display.c:392
+#: mail/mail-display.c:432
 #, c-format
 msgid "Open in %s..."
 msgstr "�b %s ���}��..."
 
 # mail/mail-display.c:359
-#: mail/mail-display.c:452
+#: mail/mail-display.c:492
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "�˵� Inline (�z�L %s)"
 
 # mail/mail-display.c:363
-#: mail/mail-display.c:456
+#: mail/mail-display.c:496
 msgid "Hide"
 msgstr "����"
 
 # mail/mail-display.c:336
-#: mail/mail-display.c:477
+#: mail/mail-display.c:517
 msgid "External Viewer"
 msgstr "�~���˵���"
 
+# ui/evolution-mail.xml.h:46
+#: mail/mail-display.c:1279
+#, fuzzy
+msgid "Downloading images"
+msgstr "���J�Ϥ�(_I)"
+
 # mail/mail-display.c:962
-#: mail/mail-display.c:1265
+#: mail/mail-display.c:1454
 msgid "Loading message content"
 msgstr "���b���J�l�󤺤�"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/mail-display.c:1553
+#: mail/mail-display.c:1741
 #, fuzzy
 msgid "Overdue:"
 msgstr "�L�����u�@(_V)�G"
 
+# mail/message-list.c:977
+#: mail/mail-display.c:1745
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:1747
+msgid "at your earliest convenience"
+msgstr ""
+
 # mail/mail-display.c:1256
-#: mail/mail-display.c:1833
+#: mail/mail-display.c:2069
 msgid "Open Link in Browser"
 msgstr "�b�s�������}�ҳs��"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/mail-display.c:1834
+#: mail/mail-display.c:2070
 msgid "Copy Link Location"
 msgstr "�ƻs�s����}"
 
 # ui/evolution-message-composer.xml.h:21
-#: mail/mail-display.c:1836
+#: mail/mail-display.c:2072
 msgid "Save Link as (FIXME)"
 msgstr "�t�s�ؼ�(FIXME)"
 
 # mail/mail-callbacks.c:1188
-#: mail/mail-display.c:1838
+#: mail/mail-display.c:2074
 msgid "Save Image as..."
 msgstr "�t�s�Ϥ�..."
 
 # mail/mail-format.c:527
-#: mail/mail-format.c:631
+#: mail/mail-format.c:626
 #, c-format
 msgid "%s attachment"
 msgstr "%s ���[�ɮ�"
 
 # mail/mail-format.c:573
-#: mail/mail-format.c:677
+#: mail/mail-format.c:672
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "����ѪR MIME �榡���l��C�u�n��ܭ�l�ɡC"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: mail/mail-format.c:760 mail/message-list.etspec.h:2
+#: mail/mail-format.c:756 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "���"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-format.c:852
+#: mail/mail-format.c:843
 msgid "Bad Address"
 msgstr "�����T���q�l�a�}"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: mail/mail-format.c:895 mail/message-list.etspec.h:7
+#: mail/mail-format.c:886 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "�H���"
 
 # mail/mail-format.c:759
-#: mail/mail-format.c:899
+#: mail/mail-format.c:890
 msgid "Reply-To"
 msgstr "�^��"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
-#: mail/mail-format.c:904 mail/message-list.etspec.h:14
+#: mail/mail-format.c:895 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "�����"
 
 # mail/mail-format.c:765
-#: mail/mail-format.c:909
+#: mail/mail-format.c:900
 msgid "Cc"
 msgstr "�ƥ�"
 
 # composer/e-msg-composer-hdrs.c:394
-#: mail/mail-format.c:914
+#: mail/mail-format.c:905
 #, fuzzy
 msgid "Bcc"
 msgstr "�K��ƥ��G"
 
 # addressbook/backend/ebook/e-card.c:3428
-#: mail/mail-format.c:945
+#: mail/mail-format.c:936
 #, fuzzy
 msgid "Mailer"
 msgstr ""
 "\n"
 "�H���: "
 
-# mail/mail-callbacks.c:1188
-#: mail/mail-format.c:1736
-#, fuzzy
-msgid "View messages..."
-msgstr "�t�s�l��..."
-
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1832
+#: mail/mail-format.c:1808
 #, fuzzy
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A�w����L�_"
 
 # mail/mail-crypto.c:84
-#: mail/mail-format.c:1859
+#: mail/mail-format.c:1835
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "�L�k�إߤ@�� PGP �d���奻�C"
 
 # mail/mail-format.c:1153
-#: mail/mail-format.c:1868
+#: mail/mail-format.c:1844
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A�w����L�_"
 
 # mail/mail-format.c:1161
-#: mail/mail-format.c:1876
+#: mail/mail-format.c:1852
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "�o�ʬO�[�J�F�Ʀ�ñ�W���l��A���������L�_"
 
 # mail/mail-format.c:1787
-#: mail/mail-format.c:2126
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ������ (%s)"
 
 # mail/mail-format.c:1799
-#: mail/mail-format.c:2140
+#: mail/mail-format.c:2116
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "���a���ɮ� (%s) �� \"%s\" ���Ī�����"
 
 # mail/mail-format.c:1803
-#: mail/mail-format.c:2145
+#: mail/mail-format.c:2121
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "���a�ɮ׫��� (%s)"
 
-#: mail/mail-format.c:2174
+#: mail/mail-format.c:2150
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "���ݸ�ƫ��� (%s)"
 
 # mail/mail-format.c:1837
-#: mail/mail-format.c:2182
+#: mail/mail-format.c:2158
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "�������~���ɮ׫��� (\"%s\" ����)"
 
 # mail/mail-format.c:1842
-#: mail/mail-format.c:2187
+#: mail/mail-format.c:2163
 msgid "Malformed external-body part."
 msgstr "�ܧΪ��~�[���峡���C"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-local.c:538 mail/mail-local.c:540
+#: mail/mail-local.c:540 mail/mail-local.c:542
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "�S�O��Ƨ�"
 
 # mail/mail-local.c:812
-#: mail/mail-local.c:670
+#: mail/mail-local.c:672
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "���s���J��Ƨ�"
 
 # mail/mail-local.c:922
-#: mail/mail-local.c:751
+#: mail/mail-local.c:753
 #, fuzzy, c-format
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
+"Cannot save folder metainfo; you may find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 "�L�k�x�s��Ƨ����@��T�F�z�ܥi��|�o�{\n"
 "�A�]�L�k�}�ҳo�Ӹ�Ƨ��G %s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: mail/mail-local.c:807
+#: mail/mail-local.c:809
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-local.c:859
+#: mail/mail-local.c:861
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
@@ -15165,18 +15445,18 @@ msgstr ""
 "%s"
 
 # mail/mail-local.c:785
-#: mail/mail-local.c:1324
+#: mail/mail-local.c:1326
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "�N��Ƨ� \"%s\" �榡�ܧ� \"%s\""
 
-#: mail/mail-local.c:1339
+#: mail/mail-local.c:1341
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
 # mail/mail-local.c:961
-#: mail/mail-local.c:1361
+#: mail/mail-local.c:1363
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -15185,18 +15465,18 @@ msgstr ""
 "�z�i��ݭn��ʭ״_���C"
 
 # camel/camel-vtrash-folder.c:109
-#: mail/mail-local.c:1450
+#: mail/mail-local.c:1452
 msgid "You cannot change the format of a non-local folder."
 msgstr "�z�����ܧ�D���a�ݸ�Ƨ����榡�C"
 
 # executive-summary/component/e-summary-url.c:80
-#: mail/mail-local.c:1459
+#: mail/mail-local.c:1461
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "���s�]�w %s"
 
 # mail/mail-mt.c:190
-#: mail/mail-mt.c:254
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -15206,7 +15486,7 @@ msgstr ""
 "%s"
 
 # mail/mail-mt.c:193
-#: mail/mail-mt.c:257
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -15218,7 +15498,7 @@ msgstr ""
 # mail/mail-mt.c:516
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
-#: mail/mail-mt.c:901
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "���b�u�@"
 
@@ -15228,123 +15508,123 @@ msgid "Filtering Folder"
 msgstr "�L�o��Ƨ�"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:262
+#: mail/mail-ops.c:267
 msgid "Fetching Mail"
 msgstr "�����l��"
 
-#: mail/mail-ops.c:538 mail/mail-ops.c:567
+#: mail/mail-ops.c:553 mail/mail-ops.c:582
 msgid "However, the message was successfully sent."
 msgstr ""
 
 # mail/mail-ops.c:599
-#: mail/mail-ops.c:603
+#: mail/mail-ops.c:618
 #, c-format
 msgid "Sending \"%s\""
 msgstr "�ǰe \"%s\""
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:738
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "���b�ǰe %2$d �ʶl�󤤪��� %1$d ��"
 
 # mail/mail-ops.c:737
-#: mail/mail-ops.c:742
+#: mail/mail-ops.c:757
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "�b�B�z %2$d �ʶl�󤤪��� %1$d �ʮɥ���"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:744 mail/mail-send-recv.c:538
+#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
 msgid "Complete."
 msgstr "�����C"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:838
+#: mail/mail-ops.c:853
 msgid "Saving message to folder"
 msgstr "�x�s�l����Ƨ�"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Moving messages to %s"
 msgstr "�N�l�󲾨� %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:918
+#: mail/mail-ops.c:934
 #, c-format
 msgid "Copying messages to %s"
 msgstr "�N�l��ƻs�� %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1025
+#: mail/mail-ops.c:1041
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "���y \"%s\" ������Ƨ�"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1208
+#: mail/mail-ops.c:1224
 msgid "Forwarded messages"
 msgstr "�w��H���l��"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1251
+#: mail/mail-ops.c:1267
 #, c-format
 msgid "Opening folder %s"
 msgstr "�}�Ҹ�Ƨ� %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1323
+#: mail/mail-ops.c:1339
 #, c-format
 msgid "Opening store %s"
 msgstr "�}�ҶJ�� %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1412
 #, c-format
 msgid "Removing folder %s"
 msgstr "������Ƨ� %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1486
+#: mail/mail-ops.c:1506
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "�إ߸�Ƨ� %s"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1557
 msgid "Refreshing folder"
 msgstr "���s���J��Ƨ�"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1593
 msgid "Expunging folder"
 msgstr "�R����Ƨ�"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1622
+#: mail/mail-ops.c:1642
 #, c-format
 msgid "Retrieving message %s"
 msgstr "���^�l�� %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1689
+#: mail/mail-ops.c:1714
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "���^�l�� %d �ʶl��"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1800
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "�x�s�l�� %d �ʶl��"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1912
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15354,7 +15634,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1915
+#: mail/mail-ops.c:1940
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15364,12 +15644,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2014
 msgid "Saving attachment"
 msgstr "�x�s����"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:2031
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15379,30 +15659,25 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2036
+#: mail/mail-ops.c:2061
 #, c-format
 msgid "Could not write data: %s"
 msgstr "�L�k�g�J��ơG%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "���_�P %s ���s�u"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2184
+#: mail/mail-ops.c:2209
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "���_�P %s ���s�u"
 
-#: mail/mail-ops.c:2265
-#, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
 # mail/mail-search-dialogue.c:113
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:506
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
 msgid "_Search"
 msgstr "�M��(_S)"
 
@@ -15469,34 +15744,44 @@ msgid "Type: %s"
 msgstr "�����G"
 
 # mail/mail-send-recv.c:233
-#: mail/mail-send-recv.c:287
+#: mail/mail-send-recv.c:293
 msgid "Send & Receive Mail"
 msgstr "�ǰe�P�����l��"
 
 # ui/evolution-mail.xml.h:2
-#: mail/mail-send-recv.c:289
+#: mail/mail-send-recv.c:295
 #, fuzzy
 msgid "Cancel All"
 msgstr "����"
 
 # mail/mail-send-recv.c:285
-#: mail/mail-send-recv.c:349
+#: mail/mail-send-recv.c:355
 msgid "Updating..."
 msgstr "���b��s..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/mail-send-recv.c:350 mail/mail-send-recv.c:403
+#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
 msgid "Waiting..."
 msgstr "���b����..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:222
+#: mail/mail-session.c:223
 msgid "User canceled operation."
 msgstr "�ϥΪ̨����ʧ@�C"
 
+# addressbook/gui/component/addressbook-config.c:352
+# mail/mail-config.glade.h:60
+#: mail/mail-session.c:276
+msgid "_Remember this password"
+msgstr "�O�U�o�ӱK�X(_R)"
+
+#: mail/mail-session.c:277
+msgid "_Remember this password for the remainder of this session"
+msgstr ""
+
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:321
+#: mail/mail-session.c:334
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "�п�J %s �Ҷ����K�X"
@@ -15507,7 +15792,7 @@ msgstr "�п�J %s �Ҷ����K�X"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:324
+#: mail/mail-session.c:337
 #, fuzzy
 msgid "Enter Password"
 msgstr "�K�X"
@@ -15540,7 +15825,7 @@ msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:879
+#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "�W�١G"
 
@@ -15575,7 +15860,7 @@ msgid "Forwarded message"
 msgstr "��H���l��"
 
 # mail/mail-ops.c:1154
-#: mail/mail-tools.c:399
+#: mail/mail-tools.c:403
 msgid "Forwarded Message"
 msgstr "��H���l��"
 
@@ -15592,7 +15877,7 @@ msgstr "�إ߸�Ƨ� %s"
 msgid "Updating vfolders for uri: %s"
 msgstr "���y \"%s\" ������Ƨ�"
 
-#: mail/mail-vfolder.c:418
+#: mail/mail-vfolder.c:447
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -15603,117 +15888,121 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:727 my-evolution/e-summary-mail.c:259
-#: my-evolution/e-summary-mail.c:733
+#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:731
 #, fuzzy
 msgid "VFolders"
 msgstr "��Ƨ�"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:784
+#: mail/mail-vfolder.c:819
 #, fuzzy
 msgid "vFolders"
 msgstr "��Ƨ�"
 
-#: mail/mail-vfolder.c:824
+#: mail/mail-vfolder.c:861
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "�s�������Ƨ�"
 
-#: mail/mail-vfolder.c:840
+#: mail/mail-vfolder.c:877
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:894
+#: mail/mail-vfolder.c:931
 msgid "New VFolder"
 msgstr "�s�W������Ƨ�"
 
 # views/mail/galview.xml.h:3
-#: mail/message-browser.c:209
+#: mail/message-browser.c:210
 msgid "(No subject)"
 msgstr "(�S���D��)"
 
 # widgets/misc/e-messagebox.c:180
-#: mail/message-browser.c:211
+#: mail/message-browser.c:212
 #, c-format
 msgid "%s - Message"
 msgstr "%s - �l��"
 
 # mail/message-list.c:677
-#: mail/message-list.c:720
+#: mail/message-list.c:733
 msgid "Unseen"
 msgstr "���\Ū"
 
 # mail/message-list.c:678
-#: mail/message-list.c:721
+#: mail/message-list.c:734
 msgid "Seen"
 msgstr "�w�\Ū"
 
 # mail/message-list.c:679
-#: mail/message-list.c:722
+#: mail/message-list.c:735
 msgid "Answered"
 msgstr "�w�^��"
 
 # mail/message-list.c:680
-#: mail/message-list.c:723
+#: mail/message-list.c:736
 msgid "Multiple Unseen Messages"
 msgstr "�h�ӥ��\Ū���l��"
 
 # mail/message-list.c:681
-#: mail/message-list.c:724
+#: mail/message-list.c:737
 msgid "Multiple Messages"
 msgstr "�h�Ӷl��"
 
 # mail/message-list.c:685
-#: mail/message-list.c:728
+#: mail/message-list.c:741
 msgid "Lowest"
 msgstr "�̧C"
 
 # mail/message-list.c:686
-#: mail/message-list.c:729
+#: mail/message-list.c:742
 msgid "Lower"
 msgstr "�C"
 
 # mail/message-list.c:690
-#: mail/message-list.c:733
+#: mail/message-list.c:746
 msgid "Higher"
 msgstr "��"
 
 # mail/message-list.c:691
-#: mail/message-list.c:734
+#: mail/message-list.c:747
 msgid "Highest"
 msgstr "�̰�"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1067
+#: mail/message-list.c:1063
 msgid "?"
 msgstr "�H"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1074
+#: mail/message-list.c:1070
 msgid "Today %l:%M %p"
 msgstr "���� %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1083
+#: mail/message-list.c:1079
 msgid "Yesterday %l:%M %p"
 msgstr "�Q�� %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1095
+#: mail/message-list.c:1091
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
+# mail/message-list.c:977
+#: mail/message-list.c:1099
+msgid "%b %d %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
 # mail/message-list.c:979
-#: mail/message-list.c:1105
+#: mail/message-list.c:1101
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:2537
+#: mail/message-list.c:2555
 msgid "Generating message list"
 msgstr "���Ͷl��M��"
 
@@ -15756,57 +16045,57 @@ msgid "Size"
 msgstr "�j�p"
 
 # addressbook/contact-editor/e-contact-editor.c:1246
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:54
 #, fuzzy
 msgid "Call"
 msgstr "�^���q��"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:58
+#: mail/message-tag-followup.c:55
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "��H"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr ""
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/message-tag-followup.c:60
+#: mail/message-tag-followup.c:57
 #, fuzzy
 msgid "For Your Information"
 msgstr "�ӷ���T"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "��H"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr ""
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: mail/message-tag-followup.c:64 ui/evolution-mail-message.xml.h:70
+#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "�^��"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/message-tag-followup.c:65 ui/evolution-mail-message.xml.h:71
+#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "�����^��"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/message-tag-followup.c:66
+#: mail/message-tag-followup.c:63
 #, fuzzy
 msgid "Review"
 msgstr "�w��"
 
-#: mail/message-tag-followup.c:315
+#: mail/message-tag-followup.c:246
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15836,16 +16125,16 @@ msgstr "�����q�\�ܸ�Ƨ� \"%s\""
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "��Ƨ�"
 
-#: mail/subscribe-dialog.c:1520
+#: mail/subscribe-dialog.c:1515
 msgid "No server has been selected"
 msgstr "�|����ܦ��A��"
 
-#: mail/subscribe-dialog.c:1581
+#: mail/subscribe-dialog.c:1576
 msgid "Please select a server."
 msgstr "�п�ܤ@�Ӧ��A���C"
 
@@ -21185,11 +21474,11 @@ msgid "Kushiro Airport"
 msgstr ""
 
 #: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
+msgid "Kyiv/Boryspil"
 msgstr ""
 
 #: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
+msgid "Kyiv/Zhulyany"
 msgstr ""
 
 #: my-evolution/Locations.h:1149
@@ -27822,8 +28111,8 @@ msgid "Mail summary"
 msgstr "�l��K�n"
 
 # mail/mail-config.glade.h:76
-#: my-evolution/e-summary-mail.c:264 my-evolution/e-summary-mail.c:407
-#: my-evolution/e-summary-mail.c:736 shell/e-local-storage.c:1022
+#: my-evolution/e-summary-mail.c:406 my-evolution/e-summary-mail.c:734
+#: shell/e-local-storage.c:1126
 #, fuzzy
 msgid "Local Folders"
 msgstr "�S�O��Ƨ�"
@@ -27842,15 +28131,15 @@ msgstr ""
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com �C��@�r"
 
-#: my-evolution/e-summary-preferences.c:599
+#: my-evolution/e-summary-preferences.c:596
 msgid "Quotes of the Day"
 msgstr "�C��@��"
 
-#: my-evolution/e-summary-preferences.c:867
+#: my-evolution/e-summary-preferences.c:863
 msgid "Add a news feed"
 msgstr "�s�W�s�D�o�e���A��"
 
-#: my-evolution/e-summary-preferences.c:875
+#: my-evolution/e-summary-preferences.c:871
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "��J�z�Ʊ�s�W�s�D�o�e���A�����}"
 
@@ -27866,7 +28155,7 @@ msgstr "<b>�U�� RDF �ɵo�Ϳ��~</b>"
 msgid "News Feed"
 msgstr "�s�D�o�e���A��"
 
-#: my-evolution/e-summary-shown.c:536
+#: my-evolution/e-summary-shown.c:541
 msgid "All"
 msgstr ""
 
@@ -27876,25 +28165,25 @@ msgstr ""
 # calendar/gui/event-editor-dialog.glade.h:2
 # mail/mail-config.glade.h:7
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:545
+#: my-evolution/e-summary-shown.c:553
 #, fuzzy
 msgid "Add"
 msgstr "�s�W(_A)"
 
-#: my-evolution/e-summary-shown.c:560 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:568 my-evolution/e-summary-table.c:58
 #, fuzzy
 msgid "Shown"
 msgstr "�U��"
 
 # ui/evolution-tasks.xml.h:3
-#: my-evolution/e-summary-tasks.c:251
+#: my-evolution/e-summary-tasks.c:300
 msgid "No tasks"
 msgstr "�L�u�@"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: my-evolution/e-summary-tasks.c:291
+#: my-evolution/e-summary-tasks.c:343
 #, fuzzy
 msgid "(No Description)"
 msgstr "�y�z�G"
@@ -29240,7 +29529,8 @@ msgstr "�u�@"
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
 #: my-evolution/my-evolution.glade.h:17
-msgid "Weather settings"
+#, fuzzy
+msgid "Weather Settings"
 msgstr "�Ѯ�]�w"
 
 #: my-evolution/my-evolution.glade.h:18
@@ -29313,7 +29603,7 @@ msgstr "�������"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: shell/e-folder-dnd-bridge.c:52
+#: shell/e-folder-dnd-bridge.c:53
 #, fuzzy, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -29330,22 +29620,22 @@ msgid "Add a Folder"
 msgstr "��Ƨ�"
 
 # mail/mail-config.glade.h:26
-#: shell/e-local-storage.c:174
+#: shell/e-local-storage.c:178
 msgid "Drafts"
 msgstr "��Z"
 
 # mail/local-config.glade.h:8
-#: shell/e-local-storage.c:175 shell/e-shell-view.c:385
-#: shell/e-shortcuts.c:1033
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Inbox"
 
-#: shell/e-local-storage.c:176
+#: shell/e-local-storage.c:180
 msgid "Outbox"
 msgstr ""
 
 # mail/mail-config.glade.h:68
-#: shell/e-local-storage.c:177
+#: shell/e-local-storage.c:181
 msgid "Sent"
 msgstr "�ǰe"
 
@@ -29620,28 +29910,20 @@ msgstr ""
 "�L�k�إ߫��w����Ƨ��G\n"
 "%s"
 
-# shell/e-shell-folder-creation-dialog.c:263
+# ui/evolution.xml.h:8
 #: shell/e-shell-folder-creation-dialog.c:291
-msgid "Evolution - Create new folder"
-msgstr "Evolution - �s�W��Ƨ�"
-
-# shell/e-shell-folder-selection-dialog.c:96
-#: shell/e-shell-folder-selection-dialog.c:97
-msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
-msgstr ""
-"��w��Ƨ������O���A�Ω�\n"
-"�ҭn�D���ʧ@�C"
+#, fuzzy
+msgid "Create New Folder"
+msgstr "�s�W��Ƨ�(_N)..."
 
 # shell/e-shell-folder-selection-dialog.c:328
-#: shell/e-shell-folder-selection-dialog.c:374
+#: shell/e-shell-folder-selection-dialog.c:376
 msgid "New..."
 msgstr "�s�W..."
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
+#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
 msgid "(Untitled)"
 msgstr "(���R�W)"
 
@@ -29662,7 +29944,7 @@ msgstr ""
 "\n"
 "�Y�z���M���ɮ����O�A�п�� \"�۰�\"�CEvolution �|���է�X�A�����B�z��k�C"
 
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
+#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:809
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
@@ -29700,7 +29982,7 @@ msgstr "��ܸ�Ƨ�"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:498
+#: shell/e-shell-importer.c:497
 #, c-format
 msgid "File %s does not exist"
 msgstr "�ɮ� %s ���s�b"
@@ -29708,18 +29990,14 @@ msgstr "�ɮ� %s ���s�b"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-importer.c:499 shell/e-shell-importer.c:509
-#: shell/e-shell-importer.c:525 shell/e-shell-importer.c:575
+#: shell/e-shell-importer.c:498 shell/e-shell-importer.c:515
+#: shell/e-shell-importer.c:565
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: shell/e-shell-importer.c:509
-msgid "You may only import to local folders"
-msgstr ""
-
 # shell/e-shell-importer.c:353
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:514
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -29729,12 +30007,12 @@ msgstr ""
 "%s"
 
 # shell/e-shell-importer.c:363
-#: shell/e-shell-importer.c:534
+#: shell/e-shell-importer.c:524
 msgid "Importing"
 msgstr "�פJ"
 
 # shell/e-shell-importer.c:371
-#: shell/e-shell-importer.c:542
+#: shell/e-shell-importer.c:532
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -29744,19 +30022,19 @@ msgstr ""
 "���b�Ұ� %s"
 
 # shell/e-shell-importer.c:384
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:545
 #, c-format
 msgid "Error starting %s"
 msgstr "�Ұ� %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:404
-#: shell/e-shell-importer.c:574
+#: shell/e-shell-importer.c:564
 #, c-format
 msgid "Error loading %s"
 msgstr "���J %s �ɵo�Ϳ��~"
 
 # shell/e-shell-importer.c:419
-#: shell/e-shell-importer.c:591
+#: shell/e-shell-importer.c:581
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -29766,37 +30044,37 @@ msgstr ""
 "���b�פJ���� 1�C"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:645
+#: shell/e-shell-importer.c:635
 msgid "Automatic"
 msgstr "�۰�"
 
 # shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:696
+#: shell/e-shell-importer.c:686
 msgid "Filename:"
 msgstr "�ɮצW�١G"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:701
+#: shell/e-shell-importer.c:691
 msgid "Select a file"
 msgstr "��ܤ@���ɮ�"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:711
+#: shell/e-shell-importer.c:701
 msgid "File type:"
 msgstr "�ɮ����O�G"
 
-#: shell/e-shell-importer.c:736
+#: shell/e-shell-importer.c:726
 msgid "Import data and settings from older programs"
 msgstr ""
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:740
+#: shell/e-shell-importer.c:730
 #, fuzzy
 msgid "Import a single file"
 msgstr "�פJ�~���ɮ׮榡"
 
-#: shell/e-shell-importer.c:805 shell/e-shell-startup-wizard.c:632
+#: shell/e-shell-importer.c:795 shell/e-shell-startup-wizard.c:638
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -29804,23 +30082,23 @@ msgstr ""
 "�еy��...\n"
 "���b���y�{�s���]�w"
 
-#: shell/e-shell-importer.c:808 shell/e-shell-startup-wizard.c:635
+#: shell/e-shell-importer.c:798 shell/e-shell-startup-wizard.c:641
 msgid "Starting Intelligent Importers"
 msgstr "�Ұʴ��z���פJ�A��"
 
 # composer/e-msg-composer-hdrs.c:355
-#: shell/e-shell-importer.c:932 shell/e-shell-startup-wizard.c:758
+#: shell/e-shell-importer.c:922 shell/e-shell-startup-wizard.c:764
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "�H��̡G"
 
 # shell/e-shell-importer.c:601
-#: shell/e-shell-importer.c:1100
+#: shell/e-shell-importer.c:1090
 msgid "Select folder"
 msgstr "��ܸ�Ƨ�"
 
 # shell/e-shell-importer.c:602
-#: shell/e-shell-importer.c:1101
+#: shell/e-shell-importer.c:1091
 msgid "Select a destination folder for importing this data"
 msgstr "��ܥت���Ƨ��Χ@�פJ�o�Ǹ��"
 
@@ -29829,7 +30107,7 @@ msgstr "��ܥت���Ƨ��Χ@�פJ�o�Ǹ��"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1203 shell/importer/intelligent.c:193
 msgid "Import"
 msgstr "�פJ"
 
@@ -29892,10 +30170,16 @@ msgstr "�}�Ҹ�Ƨ� %s"
 msgid "in \"%s\" ..."
 msgstr "�b %s ���}��..."
 
+# camel/providers/local/camel-mbox-summary.c:655
+#: shell/e-shell-shared-folder-picker-dialog.c:470
+#, fuzzy, c-format
+msgid "Could not open shared folder: %s."
+msgstr "�L�k�N��Ƨ��G%s ���s�R�W"
+
 # shell/e-shell-folder-creation-dialog.c:99
-#: shell/e-shell-shared-folder-picker-dialog.c:523
+#: shell/e-shell-shared-folder-picker-dialog.c:542
 #, fuzzy
-msgid "Cannot find open the specified shared folder."
+msgid "Cannot find the specified shared folder."
 msgstr ""
 "�L�k�إ߫��w����Ƨ��G\n"
 "%s"
@@ -29920,8 +30204,8 @@ msgstr ""
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: shell/e-shell-user-creatable-items-handler.c:537
-#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:579
+#: shell/e-shell-user-creatable-items-handler.c:633
 #: widgets/misc/e-charset-picker.c:104
 msgid "New"
 msgstr "�s�W"
@@ -29971,61 +30255,62 @@ msgid "Select the folder that you want to open"
 msgstr "��ܱz�Q�}�Ҫ���Ƨ�"
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shell-view-menu.c:594
-msgid "Create a new shortcut"
+#: shell/e-shell-view-menu.c:595
+#, fuzzy
+msgid "Create New Shortcut"
 msgstr "�s�W�@�ӱ��|"
 
 # shell/e-shell-view-menu.c:411
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:596
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "��ܱz�Q���|�����쪺��Ƨ��G"
 
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-view-menu.c:762
+#: shell/e-shell-view-menu.c:763
 #, fuzzy
 msgid "_Work Online"
 msgstr "�u�W�u�@"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-view-menu.c:775 ui/evolution.xml.h:58
+#: shell/e-shell-view-menu.c:776 ui/evolution.xml.h:63
 msgid "_Work Offline"
 msgstr "���u�u�@(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-view-menu.c:788 ui/evolution.xml.h:34
+#: shell/e-shell-view-menu.c:789 ui/evolution.xml.h:39
 msgid "Work Offline"
 msgstr "���u�u�@"
 
 # shell/e-shell-view.c:149
-#: shell/e-shell-view.c:224
+#: shell/e-shell-view.c:225
 msgid "(No folder displayed)"
 msgstr "(�S����Ƨ����)"
 
-#: shell/e-shell-view.c:1818
+#: shell/e-shell-view.c:1841
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
 # shell/e-storage.c:178
-#: shell/e-shell-view.c:1820
+#: shell/e-shell-view.c:1843
 msgid "(None)"
 msgstr "(�S��)"
 
-#: shell/e-shell-view.c:1867
+#: shell/e-shell-view.c:1890
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution �ثe���u�W�u�@�C���o�̧אּ���u�u�@�C"
 
-#: shell/e-shell-view.c:1874
+#: shell/e-shell-view.c:1897
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution �{�����u���C"
 
-#: shell/e-shell-view.c:1880
+#: shell/e-shell-view.c:1903
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution �ثe�O���u�u�@�C���o�̧אּ�u�W�u�@�C"
 
-#: shell/e-shell.c:171
+#: shell/e-shell.c:175
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -30034,12 +30319,12 @@ msgid ""
 msgstr ""
 
 # shell/e-shell.c:392
-#: shell/e-shell.c:765
+#: shell/e-shell.c:731
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "�L�k�]�w���a�ݪ��x�s�Ŷ� -- %s"
 
-#: shell/e-shell.c:1853
+#: shell/e-shell.c:1821
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -30049,35 +30334,35 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:2156
+#: shell/e-shell.c:2122
 msgid "Invalid arguments"
 msgstr "�L�Ī��Ѽ�"
 
-#: shell/e-shell.c:2158
+#: shell/e-shell.c:2124
 msgid "Cannot register on OAF"
 msgstr "����� OAF ���U"
 
-#: shell/e-shell.c:2160
+#: shell/e-shell.c:2126
 msgid "Configuration Database not found"
 msgstr "�䤣��պA��Ʈw"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:2162 shell/e-storage.c:487
+#: shell/e-shell.c:2128 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "�@����~"
 
 # shell/e-shortcuts-view.c:134
-#: shell/e-shortcuts-view.c:74
+#: shell/e-shortcuts-view.c:76
 msgid "Create new shortcut group"
 msgstr "�s�W�\��s��"
 
 # shell/e-shortcuts-view.c:137
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:77
 msgid "Group name:"
 msgstr "�s�զW�١G"
 
 # shell/e-shortcuts-view.c:260
-#: shell/e-shortcuts-view.c:175
+#: shell/e-shortcuts-view.c:173
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -30087,112 +30372,124 @@ msgstr ""
 "`%s' �ۥ\��C�����H"
 
 # shell/e-shortcuts-view.c:265
-#: shell/e-shortcuts-view.c:180
+#: shell/e-shortcuts-view.c:178
 msgid "Don't remove"
 msgstr "���n����"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:208
 msgid "Rename Shortcut Group"
 msgstr "���s�R�W�\��s��"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:209
 msgid "Rename selected shortcut group to:"
 msgstr "����w�\��s�ժ��W�ٰ��G"
 
 # shell/e-shortcuts-view.c:276
-#: shell/e-shortcuts-view.c:232
+#: shell/e-shortcuts-view.c:241
 msgid "_Small Icons"
 msgstr "�p�ϥ�(_S)"
 
 # shell/e-shortcuts-view.c:277
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:242
 msgid "Show the shortcuts as small icons"
 msgstr "�H�p�ϥ���ܥ\�ඵ��"
 
 # shell/e-shortcuts-view.c:279
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:244
 msgid "_Large Icons"
 msgstr "�j�ϥ�(_L)"
 
 # shell/e-shortcuts-view.c:280
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:245
 msgid "Show the shortcuts as large icons"
 msgstr "�H�j�ϥ���ܥ\�ඵ��"
 
 # shell/e-shortcuts-view.c:291
-#: shell/e-shortcuts-view.c:247
+#: shell/e-shortcuts-view.c:256
 msgid "_New Group..."
 msgstr "�s�W�s��(_N)..."
 
 # shell/e-shortcuts-view.c:292
-#: shell/e-shortcuts-view.c:248
+#: shell/e-shortcuts-view.c:257
 msgid "Create a new shortcut group"
 msgstr "�s�W�\��s��"
 
 # shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:259
 msgid "_Remove this Group..."
 msgstr "�����o�Ӹs��(_R)..."
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:260
 msgid "Remove this shortcut group"
 msgstr "�����o�ӥ\��s��"
 
 # shell/e-shortcuts-view.c:294
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:262
 msgid "Re_name this Group..."
 msgstr "���s�R�W�o�Ӹs��(_N)..."
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:263
 msgid "Rename this shortcut group"
 msgstr "���o�ӥ\��s�ժ��W��"
 
 # shell/e-shortcuts-view.c:300
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:268
 msgid "_Hide the Shortcut Bar"
 msgstr "���å\��C(_H)"
 
 # shell/e-shortcuts-view.c:301
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:269
 msgid "Hide the shortcut bar"
 msgstr "���å\��C"
 
+# shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:274
+#, fuzzy
+msgid "Create _Default Shortcuts"
+msgstr "�s�W�@�ӱ��|"
+
+# shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:275
+#, fuzzy
+msgid "Create Default Shortcuts"
+msgstr "�s�W�@�ӱ��|"
+
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:379
+#: shell/e-shortcuts-view.c:394
 msgid "Rename shortcut"
 msgstr "���s�R�W�\��"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:395
 msgid "Rename selected shortcut to:"
 msgstr "����w�\�઺�W�ٰ��G"
 
 # ui/evolution.xml.h:26
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:408
 msgid "Open the folder linked to this shortcut"
 msgstr "�}�ҳs���ܳo�ӥ\�઺��Ƨ�"
 
 # ui/evolution.xml.h:25
-#: shell/e-shortcuts-view.c:394 ui/evolution.xml.h:21
+#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "�b�s�����}��(_W)"
 
 # ui/evolution-mail.xml.h:59
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:410
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "�ϥηs�����}�ҳs���ܳo�ӥ\�઺��Ƨ�"
 
 # ui/evolution.xml.h:61
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "_Rename"
 msgstr "���s�R�W(_R)"
 
 # shell/e-shortcuts-view.c:295
-#: shell/e-shortcuts-view.c:397
+#: shell/e-shortcuts-view.c:413
 msgid "Rename this shortcut"
 msgstr "���o�ӥ\�઺�W��"
 
@@ -30200,22 +30497,22 @@ msgstr "���o�ӥ\�઺�W��"
 # 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:399
+#: shell/e-shortcuts-view.c:415
 msgid "Re_move"
 msgstr "����(_M)"
 
 # shell/e-shortcuts-view.c:388
-#: shell/e-shortcuts-view.c:399
+#: shell/e-shortcuts-view.c:415
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "�N�\�ඵ�رq�\��C����"
 
 # shell/e-shortcuts.c:381
-#: shell/e-shortcuts.c:621
+#: shell/e-shortcuts.c:641
 msgid "Error saving shortcuts."
 msgstr "�x�s�\�ඵ�خɵo�Ϳ��~�C"
 
 # ui/evolution.xml.h:62
-#: shell/e-shortcuts.c:1024
+#: shell/e-shortcuts.c:1080
 msgid "Shortcuts"
 msgstr "�\��"
 
@@ -30224,65 +30521,65 @@ msgid "Checkbox"
 msgstr ""
 
 # shell/e-storage.c:459
-#: shell/e-storage.c:485
+#: shell/e-storage.c:486
 msgid "No error"
 msgstr "�S�����~"
 
 # shell/e-storage.c:463
-#: shell/e-storage.c:489
+#: shell/e-storage.c:490
 msgid "A folder with the same name already exists"
 msgstr "�ۦP�W�٪���Ƨ��w�g�s�b"
 
 # shell/e-storage.c:465
-#: shell/e-storage.c:491
+#: shell/e-storage.c:492
 msgid "The specified folder type is not valid"
 msgstr "�ҫ��w����Ƨ����O�O�L�Ī�"
 
 # shell/e-storage.c:467
-#: shell/e-storage.c:493
+#: shell/e-storage.c:494
 msgid "I/O error"
 msgstr "��X/�J���~"
 
 # shell/e-storage.c:469
-#: shell/e-storage.c:495
+#: shell/e-storage.c:496
 msgid "Not enough space to create the folder"
 msgstr "�S�������Ŷ��h�إ߸�Ƨ�"
 
-#: shell/e-storage.c:497
+#: shell/e-storage.c:498
 msgid "The folder is not empty"
 msgstr ""
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:499
+#: shell/e-storage.c:500
 msgid "The specified folder was not found"
 msgstr "�䤣����w����Ƨ�"
 
 # shell/e-storage.c:473
-#: shell/e-storage.c:501
+#: shell/e-storage.c:502
 msgid "Function not implemented in this storage"
 msgstr "�o���x�s�Ŷ����\�ऴ����@"
 
 # shell/e-storage.c:477
-#: shell/e-storage.c:505
+#: shell/e-storage.c:506
 msgid "Operation not supported"
 msgstr "��ʤ��䴩"
 
 # shell/e-storage.c:479
-#: shell/e-storage.c:507
+#: shell/e-storage.c:508
 msgid "The specified type is not supported in this storage"
 msgstr "�o���x�s�Ŷ����䴩�ҫ��w�����O"
 
 # shell/e-storage.c:471
-#: shell/e-storage.c:509
+#: shell/e-storage.c:510
 msgid "The specified folder cannot be modified or removed"
 msgstr "���w����Ƨ�����s��β���"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:512
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "������Ƨ��m���l��Ƨ����U"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 #, fuzzy
 msgid "Cannot create a folder with that name"
 msgstr "�L�k�إ߸�Ƨ���w %s �G %s"
@@ -30334,23 +30631,23 @@ msgid ""
 msgstr ""
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1083
+#: shell/evolution-shell-component.c:1094
 #, fuzzy
 msgid "CORBA error"
 msgstr "��X/�J���~"
 
-#: shell/evolution-shell-component.c:1085
+#: shell/evolution-shell-component.c:1096
 msgid "Interrupted"
 msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/evolution-shell-component.c:1087
+#: shell/evolution-shell-component.c:1098
 #, fuzzy
 msgid "Invalid argument"
 msgstr "�L�Ī��Ѽ�"
 
-#: shell/evolution-shell-component.c:1089
+#: shell/evolution-shell-component.c:1100
 msgid "Already has an owner"
 msgstr ""
 
@@ -30368,64 +30665,64 @@ msgstr ""
 # widgets/misc/e-dateedit.c:432
 # widgets/misc/e-dateedit.c:1341
 # widgets/misc/e-dateedit.c:1456
-#: shell/evolution-shell-component.c:1091
+#: shell/evolution-shell-component.c:1102
 #, fuzzy
 msgid "No owner"
 msgstr "�L"
 
 # calendar/gui/calendar-commands.c:266
-#: shell/evolution-shell-component.c:1093
+#: shell/evolution-shell-component.c:1104
 #, fuzzy
 msgid "Not found"
 msgstr "�䤣��W��"
 
 # mail/mail-config.glade.h:1
-#: shell/evolution-shell-component.c:1095
+#: shell/evolution-shell-component.c:1106
 #, fuzzy
 msgid "Unsupported type"
 msgstr " �ˬd�i�䴩�����O(_C)"
 
-#: shell/evolution-shell-component.c:1097
+#: shell/evolution-shell-component.c:1108
 msgid "Unsupported schema"
 msgstr ""
 
 # mail/mail-session.c:161
-#: shell/evolution-shell-component.c:1099
+#: shell/evolution-shell-component.c:1110
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "�ϥΪ̨����ʧ@�C"
 
 # shell/e-storage.c:467
-#: shell/evolution-shell-component.c:1101
+#: shell/evolution-shell-component.c:1112
 #, fuzzy
 msgid "Internal error"
 msgstr "�䥦���~"
 
-#: shell/evolution-shell-component.c:1105
+#: shell/evolution-shell-component.c:1116
 #, fuzzy
 msgid "Exists"
 msgstr "�s�b"
 
 # mail/mail-config.glade.h:37
-#: shell/evolution-shell-component.c:1107
+#: shell/evolution-shell-component.c:1118
 #, fuzzy
 msgid "Invalid URI"
 msgstr "���X�k"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: shell/evolution-shell-component.c:1111
+#: shell/evolution-shell-component.c:1122
 #, fuzzy
 msgid "Has subfolders"
 msgstr "�S���o�Ӹ�Ƨ� %s"
 
 # mail/mail-callbacks.c:1106
-#: shell/evolution-shell-component.c:1113
+#: shell/evolution-shell-component.c:1124
 #, fuzzy
 msgid "No space left"
 msgstr "�S����w�l��"
 
-#: shell/evolution-shell-component.c:1115
+#: shell/evolution-shell-component.c:1126
 msgid "Old owner has died"
 msgstr ""
 
@@ -30454,6 +30751,35 @@ msgstr "�D��"
 msgid "The following connections are currently active:"
 msgstr "�H�U�O�ثe���q���s�u�G"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "��ƾ�"
+
+# ui/evolution-addressbook.xml.h:17
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "�s���H(_N)�G"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "�l��(_M)"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "�u�@"
+
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 msgid "Folder name:"
@@ -30469,6 +30795,38 @@ msgstr "��Ƨ����O�G"
 msgid "Specify where to create the folder:"
 msgstr "���w�إ߸�Ƨ�����m�G"
 
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Blah blah."
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "Insert some explanatory text here."
+msgstr ""
+
+# ui/evolution.xml.h:8
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "�s�W��Ƨ�(_N)..."
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "��Ƨ��W�١G"
+
+# calendar/gui/e-itip-control.glade.h:10
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#, fuzzy
+msgid "_Server:"
+msgstr "���A���W��(_S)�G"
+
+# mail/mail-config.glade.h:80
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#, fuzzy
+msgid "_User:"
+msgstr "�ϥΪ̦W��(_U)�G"
+
 # shell/importer/import.glade.h:2
 #: shell/glade/evolution-startup-wizard.glade.h:3
 #, fuzzy
@@ -30581,17 +30939,17 @@ msgstr "Evolution �i�H�ۤU�C�ɮ׶פJ��ơG"
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:91
+#: shell/main.c:92
 msgid "Evolution"
 msgstr "Evolution"
 
 # ui/evolution.xml.h:17
-#: shell/main.c:97
+#: shell/main.c:98
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Evolution ����(_W)"
 
-#: shell/main.c:222
+#: shell/main.c:223
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -30624,7 +30982,7 @@ msgstr ""
 "�����a���ݱz���^�m�I\n"
 
 # shell/main.c:107
-#: shell/main.c:245
+#: shell/main.c:246
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -30635,43 +30993,43 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "���n�A��ܳo�ӰT��"
 
 # shell/main.c:138
-#: shell/main.c:347
+#: shell/main.c:348
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "�L�k�s�� Ximian Evolution shell�C"
 
 # shell/main.c:138
-#: shell/main.c:356
+#: shell/main.c:357
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "�L�k��l�� Ximian Evolution shell�G %s"
 
 # shell/main.c:184
-#: shell/main.c:437
+#: shell/main.c:438
 msgid "Disable splash screen"
 msgstr "������ۮĪG�ù�"
 
-#: shell/main.c:438
+#: shell/main.c:439
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "�}�l�פJ"
 
-#: shell/main.c:439
+#: shell/main.c:440
 #, fuzzy
 msgid "Start in online mode"
 msgstr "�Ұʴ��z���פJ�A��"
 
 # shell/main.c:185
-#: shell/main.c:440
+#: shell/main.c:441
 msgid "Send the debugging output of all components to a file."
 msgstr "�N�������󪺰�����X��ƶǰe�ܤ@���ɮסC"
 
-#: shell/main.c:458
+#: shell/main.c:459
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -30679,7 +31037,7 @@ msgid ""
 msgstr ""
 
 # shell/main.c:217
-#: shell/main.c:488
+#: shell/main.c:490
 msgid "Cannot initialize the Bonobo component system."
 msgstr "�L�k��l�� Bonobo ����t�ΡC"
 
@@ -30726,127 +31084,120 @@ msgstr "�ƻs��w�d��"
 msgid "Copy to Folder..."
 msgstr "�_�s�ܸ�Ƨ�(_C)..."
 
-# ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr "�s�W�s���H"
-
-# ui/evolution-addressbook.xml.h:2
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr "�s�W�s���H�M��"
-
 # ui/evolution-event-editor.xml.h:16
 # ui/evolution-task-editor-dialog.xml.h:17
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "�ŤU��w�d��"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr "�R����w���s���H"
 
 # ui/evolution-mail.xml.h:56
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:11
 #, fuzzy
 msgid "Move Contact(s) to Another Folder..."
 msgstr "�N��w���l�󲾦ܥt�@�Ӹ�Ƨ�"
 
 # mail/folder-browser.c:711
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:12
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:14
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:14
 msgid "Paste the clipboard"
 msgstr "�K�W�ŶK�O"
 
 # ui/evolution-calendar.xml.h:22
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr "�w���N�n�C�L���s���H"
 
+# ui/evolution-event-editor.xml.h:34
+# ui/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:16
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
+msgid "Print Pre_view"
+msgstr "�w���C�L(_V)"
+
 # ui/evolution-addressbook.xml.h:11
-#: ui/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr "�C�L��w���s���H"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:22
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr "�N��w���s���H�x�s�� VCard�C"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "����"
 
 # ui/evolution-addressbook.xml.h:15
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr "��ܥ����s���H"
 
 # calendar/gui/e-calendar-table.c:714
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:23
 msgid "Send a mess to the selected contacts."
 msgstr "�ǰe�l�󵹿�w���s���H�C"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ui/evolution-addressbook.xml.h:26
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr "�ǰe�l�󵹳s���H"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
 # addressbook/gui/widgets/e-addressbook-view.c:612
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr "�Űe��w�s���H����L�ϥΪ̡C"
 
 # ui/evolution-addressbook.xml.h:12
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:26
 msgid "Stop"
 msgstr "����"
 
 # ui/evolution-addressbook.xml.h:13
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop Loading"
 msgstr "������J"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 #, fuzzy
 msgid "View the current contact"
 msgstr "�ثe�ɶ�"
 
 # ui/evolution.xml.h:41
-#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:25
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:25
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:14
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:91
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:37
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "����(_A)"
 
-# ui/evolution-addressbook.xml.h:17
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Contact List"
-msgstr "�s���H�M��(_C)"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:24
 # calendar/gui/event-editor-dialog.glade.h:29
-#: ui/evolution-addressbook.xml.h:37 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "�s���H��H(_F)..."
 
 # mail/folder-browser.c:711
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:35
 msgid "_Move to Folder..."
 msgstr "���ܸ�Ƨ�(_M)..."
 
@@ -30854,23 +31205,23 @@ msgstr "���ܸ�Ƨ�(_M)..."
 # 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
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:39
 msgid "_Save as VCard"
 msgstr "�x�s�� VCard �ɮ׮榡(_S)"
 
 # ui/evolution-addressbook.xml.h:19
-#: ui/evolution-addressbook.xml.h:43
+#: ui/evolution-addressbook.xml.h:40
 msgid "_Search for Contacts"
 msgstr "�M��s���H(_S)"
 
 # ui/evolution-event-editor.xml.h:72
 # ui/evolution-task-editor-dialog.xml.h:86
-#: ui/evolution-addressbook.xml.h:44
+#: ui/evolution-addressbook.xml.h:41
 msgid "_Select All"
 msgstr "����(_S)"
 
 # ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-addressbook.xml.h:45
+#: ui/evolution-addressbook.xml.h:42
 #, fuzzy
 msgid "_Send Message to Contact..."
 msgstr "�ǰe�l�󵹳s���H(_M)..."
@@ -30926,13 +31277,6 @@ msgstr "��"
 msgid "Previews the calendar to be printed"
 msgstr "�w���N�n�C�L����ƾ䤺�e"
 
-# ui/evolution-event-editor.xml.h:34
-# ui/evolution-task-editor-dialog.xml.h:37
-#: ui/evolution-calendar.xml.h:16 ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:12
-msgid "Print Pre_view"
-msgstr "�w���C�L(_V)"
-
 # ui/evolution-calendar.xml.h:26
 #: ui/evolution-calendar.xml.h:17
 msgid "Print this calendar"
@@ -30978,7 +31322,7 @@ msgstr "�g"
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:4
+#: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "����"
 
@@ -30994,7 +31338,7 @@ msgstr "�R���o�Ӷ���"
 
 # ui/evolution.xml.h:22
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:16
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:19
 msgid "Main toolbar"
 msgstr "�D�u��C"
 
@@ -31015,8 +31359,8 @@ msgstr "�C�L�o�Ӷ���"
 # ui/evolution-message-composer.xml.h:17
 # ui/evolution-task-editor-dialog.xml.h:50
 # widgets/misc/e-filter-bar.c:241
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5 widgets/misc/e-filter-bar.c:154
 msgid "Save"
 msgstr "�x�s"
 
@@ -31053,9 +31397,9 @@ msgstr "�x�s�o�Ӷ��ب�Ϻ�"
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:48
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:42
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "�ɮ�(_F)"
 
@@ -31070,7 +31414,7 @@ msgstr "�C�L�H��(_V)..."
 # ui/evolution-task-editor-dialog.xml.h:51
 #: ui/evolution-contact-editor.xml.h:7
 #: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "�t�s�s��(_A)..."
 
@@ -31090,8 +31434,8 @@ msgstr "�ǰe�l�󵹳s���H(_M)..."
 # ui/evolution-task-editor-dialog.xml.h:85
 #: ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "�x�s(_S)"
 
@@ -31213,33 +31557,46 @@ msgstr "�}�ҵ����H�K���g�l��"
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "�ä[�����b�Ҧ���Ƨ����������w�R�����l��"
 
-# ui/evolution-mail.xml.h:86
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
 #: ui/evolution-mail-global.xml.h:11
+#, fuzzy
+msgid "Post New Message"
+msgstr "���g�s�l��(_N)"
+
+# mail/mail-ops.c:825
+#: ui/evolution-mail-global.xml.h:12
+#, fuzzy
+msgid "Post a message to a Public folder"
+msgstr "�x�s�l����Ƨ�"
+
+# ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-global.xml.h:13
 msgid "Show message preview window"
 msgstr "��ܶl��w������"
 
 # ui/evolution-mail.xml.h:90
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:14
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "�q�\�Ψ����q�\�b���ݦ��A������Ƨ�"
 
 # ui/evolution-mail.xml.h:99
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:15
 msgid "Virtual Folder _Editor..."
 msgstr "������Ƨ��s�边(_E)..."
 
 # ui/evolution-mail.xml.h:105
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:17
 msgid "_Filters..."
 msgstr "�L�o��(_F)..."
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-mail-global.xml.h:18
 msgid "_Preview Pane"
 msgstr "�w������(_P)"
 
 # mail/subscribe-dialog.c:271
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:19
 msgid "_Subscribe to Folders..."
 msgstr "�q�\�ܸ�Ƨ�(_S)..."
 
@@ -31364,7 +31721,7 @@ msgstr "�R��(_E)"
 
 # ui/evolution-mail.xml.h:106
 # ui/evolution.xml.h:50
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:43
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "��� (_F)"
 
@@ -31688,15 +32045,28 @@ msgstr ""
 msgid "P_revious Unread Message"
 msgstr "�W�@�ʥ��\Ū���l��"
 
-# ui/evolution-mail.xml.h:24
+# mail/message-browser.c:188
+# ui/evolution-mail.xml.h:70
 #: ui/evolution-mail-message.xml.h:62
 #, fuzzy
+msgid "Post a Reply"
+msgstr "�u�@�^��"
+
+# camel/providers/imap/camel-imap-provider.c:45
+#: ui/evolution-mail-message.xml.h:63
+#, fuzzy
+msgid "Post a reply to a message message in a Public folder"
+msgstr "�ˬd�Ҧ���Ƨ��̪��s�l��"
+
+# ui/evolution-mail.xml.h:24
+#: ui/evolution-mail-message.xml.h:64
+#, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "�W�@�ʭ��n�l��"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "�w���ݭn�C�L���l��"
 
@@ -31704,159 +32074,159 @@ msgstr "�w���ݭn�C�L���l��"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "�W�@�B"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "�C�L�l��"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr ""
 
 # ui/evolution-mail.xml.h:40
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "�N��w���l����H���Y�H"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr ""
 
 # ui/evolution-mail.xml.h:73
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "S_earch Message..."
 msgstr "�M��l��(_E)..."
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr ""
 
 # ui/evolution-mail.xml.h:74
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "�t�s�l�󦨤�r�ɮ�"
 
 # ui/evolution-mail.xml.h:75
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "�j�M��ܪ��l�󥻤夤����r"
 
 # ui/evolution-event-editor.xml.h:50
 # ui/evolution-task-editor-dialog.xml.h:59
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:81
 msgid "Setup the page settings for your current printer"
 msgstr "�]�w�ثe�L�����������]�w"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "��ܶl���l��(_S)"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "��ܥ������Y(_H)"
 
 # ui/evolution-mail.xml.h:86
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "�ϥΥ��`�Ҧ���ܶl��"
 
 # ui/evolution-mail.xml.h:87
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "��ܶl��θԲ����Y"
 
 # ui/evolution-mail.xml.h:89
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "��ܶl���l��"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr ""
 
 # ui/evolution-mail.xml.h:94
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "�_���w���l��"
 
 # ui/evolution-mail.xml.h:95
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "�l��C��������Ƨ�(_L)..."
 
 # ui/evolution-mail.xml.h:96
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "�H��̵�����Ƨ�(_N)..."
 
 # ui/evolution-mail.xml.h:97
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "����̵�����Ƨ�(_R)..."
 
 # ui/evolution-mail.xml.h:98
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "�D��������Ƨ�(_S)..."
 
 # ui/evolution-message-composer.xml.h:1
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Attached"
 msgstr "���["
 
 # ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "�ƻs�ܸ�Ƨ�(_C)"
 
 # ui/evolution-mail.xml.h:102
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "�إ߶l��W�h(_C)"
 
 # ui/evolution-mail.xml.h:107
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "��H�l��(_F)"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "����"
 
 # mail/mail-config.glade.h:37
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:100
 #, fuzzy
 msgid "_Inline"
 msgstr "���`"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:101
 #, fuzzy
 msgid "_Larger"
 msgstr "�I�s��"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "�˵��l��(_M)"
 
 # ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "���ܸ�Ƨ�(_M)"
 
 # widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "�U�@�ʶl��"
@@ -31867,44 +32237,50 @@ msgstr "�U�@�ʶl��"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "����(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "�}�Ҷl��(_O)"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "�W�@�ʶl��"
 
 # mail/mail-config.glade.h:56
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Quoted"
 msgstr "�ޥ�"
 
+# ui/evolution.xml.h:61
+#: ui/evolution-mail-message.xml.h:111
+#, fuzzy
+msgid "_Resend..."
+msgstr "���s�R�W(_R)..."
+
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-calendar.xml.h:44
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: ui/evolution-mail-message.xml.h:111 ui/evolution.xml.h:56
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:61
 msgid "_Tools"
 msgstr "�u��(_T)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "�_��(_U)"
 
 # ui/evolution.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
 msgid "Close this window"
 msgstr "�����o�ӵ���"
 
@@ -31913,9 +32289,9 @@ msgstr "�����o�ӵ���"
 # ui/evolution-task-editor-dialog.xml.h:65
 # ui/evolution.xml.h:43
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:38
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
 msgid "_Close"
 msgstr "����(_C)"
 
@@ -31924,7 +32300,7 @@ msgstr "����(_C)"
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
 #: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:57
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:62
 msgid "_View"
 msgstr "�˵�(_V)"
 
@@ -31961,183 +32337,154 @@ msgid "For_mat"
 msgstr "�榡"
 
 # ui/evolution-message-composer.xml.h:8
-#: ui/evolution-message-composer.xml.h:9 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
-msgid "H_TML"
+msgid "HT_ML"
 msgstr "HTML"
 
-# ui/evolution-message-composer.xml.h:10
-#: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
-msgstr "�¤�r�ɮ�(_F)..."
-
-# ui/evolution-message-composer.xml.h:9
-#: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr "�N�ɮץH�¤�r�榡���[��l��"
-
-# ui/evolution-message-composer.xml.h:10
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr "���J�¤�r�ɮ�..."
-
 # 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:13
+#: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "�}��"
 
 # ui/evolution-message-composer.xml.h:12
-#: ui/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "�}������"
 
 # ui/evolution-message-composer.xml.h:13
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "PGP �[�K"
 
 # ui/evolution-message-composer.xml.h:14
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "PGP �[ñ"
 
 # ui/evolution-message-composer.xml.h:15
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr "S/MIME �[�K"
 
 # ui/evolution-message-composer.xml.h:16
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr "S/MIME �[ñ"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-message-composer.xml.h:18
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "�t�s�s��"
 
 # ui/evolution-message-composer.xml.h:20
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr "�x�s��Z(_D)"
 
 # ui/evolution-message-composer.xml.h:22
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "�x�s�ܸ�Ƨ�..."
 
 # ui/evolution-event-editor.xml.h:44
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-task-editor-dialog.xml.h:53
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:21
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "�x�s�ثe�ɮ�"
 
 # ui/evolution-message-composer.xml.h:24
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "�ϥΥt�@�W���x�s�ثe���ɮ�"
 
 # ui/evolution-message-composer.xml.h:25
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "�N�l���x�s�ܫ��w����Ƨ�"
 
 # ui/evolution-message-composer.xml.h:26
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "�ǰe"
 
-# ui/evolution-message-composer.xml.h:27
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
-msgstr "�y��ǰe(_L)"
-
-# ui/evolution-message-composer.xml.h:28
-#: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
-msgstr "�y��ǰe(_L)"
-
 # ui/evolution-message-composer.xml.h:29
-#: ui/evolution-message-composer.xml.h:30
-#: ui/evolution-signature-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "�ϥ� HTML �榡�ǰe�l��"
 
-# ui/evolution-message-composer.xml.h:30
-#: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
-msgstr "�y��ǰe�l��"
-
 # ui/evolution-message-composer.xml.h:31
-#: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
 msgstr "�ߨ�ǰe�l��"
 
 # ui/evolution-message-composer.xml.h:32
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:27
 msgid "Show / hide attachments"
 msgstr "���/���ê��[�ɮ�"
 
 # ui/evolution-message-composer.xml.h:33
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:28
 msgid "Show _attachments"
 msgstr "��ܪ��[�ɮ�(_A)"
 
 # ui/evolution-message-composer.xml.h:34
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show attachments"
 msgstr "��ܪ��[�ɮ�"
 
 # ui/evolution-message-composer.xml.h:35
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:30
 msgid "Sign this message with your PGP key"
 msgstr "�αz�� PGP �_�͵��l��[�W�Ʀ�ñ�W"
 
 # ui/evolution-message-composer.xml.h:36
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:31
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "�αz�� S/MIME ñ�W�Үѵ��l��[�W�Ʀ�ñ�W"
 
 # ui/evolution-message-composer.xml.h:37
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:32
 msgid "Toggles whether the BCC field is displayed"
 msgstr "�����K��ƥ���쪺��ܪ��A"
 
 # ui/evolution-message-composer.xml.h:38
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:33
 msgid "Toggles whether the CC field is displayed"
 msgstr "�����ƥ���쪺��ܪ��A"
 
 # ui/evolution-message-composer.xml.h:39
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:34
 msgid "Toggles whether the From chooser is displayed"
 msgstr "�����H��̿�ܾ�����ܪ��A"
 
 # ui/evolution-message-composer.xml.h:40
-#: ui/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "�����^����쪺��ܪ��A"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-message-composer.xml.h:36
 msgid "_Attachment..."
 msgstr "����(_A)..."
 
 # ui/evolution-message-composer.xml.h:41
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:37
 msgid "_Bcc Field"
 msgstr "�K��ƥ�(_B)"
 
 # ui/evolution-message-composer.xml.h:42
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Cc Field"
 msgstr "�ƥ�(_C)"
 
@@ -32148,39 +32495,57 @@ msgstr "�ƥ�(_C)"
 # ui/evolution-mail.xml.h:103
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Delete all"
 msgstr "�����R��(_D)"
 
 # ui/evolution-message-composer.xml.h:47
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:43
 msgid "_From Field"
 msgstr "�H���(_F)"
 
 # ui/evolution-message-composer.xml.h:49
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "���J(_I)"
 
 # ui/evolution-message-composer.xml.h:51
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "�}��(_O)..."
 
 # ui/evolution-message-composer.xml.h:52
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Reply-To Field"
 msgstr "�^��(_R)"
 
+# ui/evolution-message-composer.xml.h:8
+#: ui/evolution-signature-editor.xml.h:4
+#, fuzzy
+msgid "H_TML"
+msgstr "HTML"
+
+# ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "�x�s�o�Ӷ��ب�������ܲ�"
+
 # ui/evolution-event-editor.xml.h:60
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution.xml.h:46
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution.xml.h:51
 msgid "_Help"
 msgstr "����(_H)"
 
+# mail/mail-config.glade.h:74
+#: ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "_Signature editor"
+msgstr "ñ�W�ɡG"
+
 # ui/evolution-subscribe.xml.h:1
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
@@ -32299,174 +32664,212 @@ msgstr "���� Ximian Evolution..."
 msgid "Add to _Shortcut Bar"
 msgstr "�s�W��\��C(_S)"
 
-# ui/evolution.xml.h:3
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change Evolution's settings"
+msgstr "Evolution"
+
+# ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Change the name of this folder"
 msgstr "���o�Ӹ�Ƨ����W��"
 
 # ui/evolution.xml.h:7
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "Copy this folder"
 msgstr "�ƻs�o�Ӹ�Ƨ�"
 
 # ui/evolution.xml.h:8
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
 msgid "Create _New Folder..."
 msgstr "�s�W��Ƨ�(_N)..."
 
 # ui/evolution.xml.h:9
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:9
 msgid "Create a link to this folder in the shortcut bar"
 msgstr "�b�\��C�����o�Ӹ�Ƨ��إߤ@�ӳs��"
 
 # ui/evolution.xml.h:10
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:10
 msgid "Create a new folder"
 msgstr "�s�W�@�Ӹ�Ƨ�"
 
+# shell/e-shortcuts-view.c:292
+#: ui/evolution.xml.h:11
+msgid "Create a new shortcut"
+msgstr "�s�W�@�ӱ��|"
+
+# ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "�s�W�@�Ӹ�Ƨ�"
+
 # ui/evolution.xml.h:47
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:13
 msgid "Delete this folder"
 msgstr "�R���o�Ӹ�Ƨ�"
 
 # ui/evolution.xml.h:14
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "��ܤ@�Ӥ��P����Ƨ�"
 
 # ui/evolution.xml.h:15
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "���}(_X)"
 
 # ui/evolution.xml.h:17
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:16
 msgid "Evolution _Window"
 msgstr "Evolution ����(_W)"
 
 # ui/evolution.xml.h:19
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:17
 msgid "Exit the program"
 msgstr "���}�o�ӵ{��"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:18
 msgid "Import data from other programs"
 msgstr ""
 
 # ui/evolution.xml.h:23
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:20
 msgid "Move this folder to another place"
 msgstr "�N�o�Ӹ�Ƨ����ܥt�@�Ӧa��"
 
 # ui/evolution.xml.h:8
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "Open Other _User's Folder..."
 msgstr "�s�W��Ƨ�(_N)..."
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:22
 msgid "Open a folder that is made available by some other user on the server"
 msgstr ""
 
 # ui/evolution.xml.h:24
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:23
 msgid "Open in New Window"
 msgstr "�b�s�����}��"
 
 # ui/evolution.xml.h:26
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:25
 msgid "Open this folder in an other window"
 msgstr "�ϥηs�����}�ҳo�Ӹ�Ƨ�"
 
+# ui/evolution-mail.xml.h:110
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "�l��]�w(_M)..."
+
 # ui/evolution-mail.xml.h:81
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:27
 msgid "Send / Receive"
 msgstr "�ǰe / ����"
 
 # ui/evolution-mail.xml.h:82
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:28
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "�ǰe�ݰe���l��α����s�l��"
 
+# mail/mail-config.glade.h:40
+#: ui/evolution.xml.h:29
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "�l��]�w"
+
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:30
 msgid "Show information about Ximian Evolution"
 msgstr "������� Ximian Evolution ����T"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:31
 msgid "Submit Bug Report"
 msgstr "�ǰe���~���i"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:32
 msgid "Submit _Bug Report"
 msgstr "�ǰe���~���i(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:33
 msgid "Submit a bug report using Bug Buddy"
 msgstr "�ϥ� Bug Buddy �e�X���~���i�C"
 
 # ui/evolution.xml.h:31
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:34
 msgid "Toggle"
 msgstr "����"
 
 # ui/evolution.xml.h:32
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:35
 msgid "Toggle whether to show the folder bar"
 msgstr "������Ƨ��M�檺��ܪ��A"
 
 # ui/evolution.xml.h:33
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:36
 msgid "Toggle whether to show the shortcut bar"
 msgstr "������ƥ\��C����ܪ��A"
 
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:37
 msgid "Toggle whether we are working offline."
 msgstr "�������u/�b�u�u�@�����A�C"
 
 # ui/evolution.xml.h:38
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "View the selected folder"
 msgstr "�˵���w����Ƨ�"
 
 # ui/evolution.xml.h:16
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:40
 msgid "Ximian Evolution _FAQ"
 msgstr "Ximian Evolution _FAQ"
 
 # ui/evolution.xml.h:40
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:41
 msgid "_About Ximian Evolution..."
 msgstr "���� Ximian Evolution(_A)..."
 
 # ui/evolution.xml.h:45
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:44
 msgid "_Copy..."
 msgstr "�ƻs(_C)..."
 
 # ui/evolution.xml.h:51
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:48
 msgid "_Folder Bar"
 msgstr "��Ƨ��M��(_F)"
 
+# ui/evolution-mail.xml.h:106
+# ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
+#, fuzzy
+msgid "_Folder..."
+msgstr "��� (_F)"
+
 # ui/evolution.xml.h:52
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "���ܸ�Ƨ�(_G)..."
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Import..."
 msgstr "�פJ..."
 
 # ui/evolution.xml.h:57
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:53
 msgid "_Move..."
 msgstr "����(_M)..."
 
@@ -32474,41 +32877,42 @@ msgstr "����(_M)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:49
+#: ui/evolution.xml.h:54
 msgid "_New"
 msgstr "�s�W(_N)"
 
 # ui/evolution.xml.h:59
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:55
 msgid "_New Folder"
 msgstr "�s�W��Ƨ�(_N)"
 
-# ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:51
+# calendar/gui/event-editor-dialog.glade.h:13
+#: ui/evolution.xml.h:56
 #, fuzzy
-msgid "_Pilot Settings..."
-msgstr "�l��]�w(_M)..."
+msgid "_Preferences..."
+msgstr "�D�g���ʬ��|(_N)"
 
 # ui/evolution.xml.h:61
-#: ui/evolution.xml.h:52
+#: ui/evolution.xml.h:57
 msgid "_Rename..."
 msgstr "���s�R�W(_R)..."
 
 # ui/evolution-mail.xml.h:119
-#: ui/evolution.xml.h:53
+#: ui/evolution.xml.h:58
 msgid "_Send / Receive"
 msgstr "�ǰe / ���� (_S)"
 
 # ui/evolution.xml.h:62
-#: ui/evolution.xml.h:54
-msgid "_Shortcut"
-msgstr "�\��(_S)"
-
-# ui/evolution.xml.h:62
-#: ui/evolution.xml.h:55
+#: ui/evolution.xml.h:59
 msgid "_Shortcut Bar"
 msgstr "�\��C(_S)"
 
+# ui/evolution.xml.h:62
+#: ui/evolution.xml.h:60
+#, fuzzy
+msgid "_Shortcut..."
+msgstr "�\��(_S)"
+
 # calendar/gui/e-calendar-table.c:159
 #: ui/my-evolution.xml.h:3
 msgid "Print summary"
@@ -32522,21 +32926,48 @@ msgstr "���s���J"
 msgid "Reload the view"
 msgstr "���s���J�˵���"
 
-# data/evolution.keys.in.h:1
+# views/addressbook/galview.xml.h:2
 #: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr "�a�}�d"
+#, fuzzy
+msgid "By _Company"
+msgstr "�̤��q"
 
-# views/addressbook/galview.xml.h:2
+# data/evolution.keys.in.h:1
 #: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "�̤��q"
+#, fuzzy
+msgid "_Address Cards"
+msgstr "�a�}�d"
 
 # views/addressbook/galview.xml.h:3
 #: views/addressbook/galview.xml.h:3
-msgid "Phone List"
+#, fuzzy
+msgid "_Phone List"
 msgstr "�q�ܲM��"
 
+# widgets/menus/gal-view-menus.c:202
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "�g�˵�"
+
+# addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "���˵�"
+
+# ui/evolution-calendar.xml.h:15
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_Month View"
+msgstr "���˵�"
+
+# ui/evolution-calendar.xml.h:35
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Work Week View"
+msgstr "�u�@�g�˵�"
+
 # mail/mail-account-gui.c:682
 #: views/mail/galview.xml.h:1
 #, fuzzy
@@ -32568,13 +32999,20 @@ msgid "Messages"
 msgstr "�l��"
 
 # views/tasks/galview.xml.h:2
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Category"
 msgstr "�����O"
 
+# ui/evolution-tasks.xml.h:9
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "_Tasks"
+msgstr "�u�@(_T)"
+
 #. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
 msgid "UTC"
 msgstr ""
 
@@ -32758,12 +33196,12 @@ msgid "..."
 msgstr "..."
 
 # mail/mail-search.c:299
-#: widgets/misc/e-filter-bar.c:146
+#: widgets/misc/e-filter-bar.c:188
 msgid "Search Editor"
 msgstr "�M��s�边"
 
 # widgets/misc/e-filter-bar.c:168
-#: widgets/misc/e-filter-bar.c:162
+#: widgets/misc/e-filter-bar.c:210
 msgid "Save Search"
 msgstr "�x�s�j�M���G"
 
@@ -32816,26 +33254,26 @@ msgid "Don't show this message again."
 msgstr "���n�A��ܳo�ӰT���C"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:512
+#: widgets/misc/e-search-bar.c:519
 #, fuzzy
 msgid "_Find Now"
 msgstr "�ߧY�j�M"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:513
+#: widgets/misc/e-search-bar.c:520
 #, fuzzy
 msgid "_Clear"
 msgstr "�M��"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: widgets/misc/e-search-bar.c:875
+#: widgets/misc/e-search-bar.c:893
 msgid "Clear"
 msgstr "�M��"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: widgets/misc/e-search-bar.c:877
+#: widgets/misc/e-search-bar.c:895
 msgid "Find Now"
 msgstr "�ߧY�j�M"
 
@@ -32852,20 +33290,167 @@ msgid "The Personal Calendar Server; calendar factory"
 msgstr "�ӤH����ƾ���A���F��ƾ䤸��u�t"
 
 # wombat/wombat.c:173
-#: wombat/wombat.c:200
+#: wombat/wombat.c:199
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs()�G�����l�� GNOME-VFS"
 
 # wombat/wombat.c:185
-#: wombat/wombat.c:212
+#: wombat/wombat.c:211
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba()�G�����l�� GNOME"
 
 # wombat/wombat.c:198
-#: wombat/wombat.c:225
+#: wombat/wombat.c:224
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo()�G�����l�� Bonobo"
 
+# ui/evolution.xml.h:57
+#, fuzzy
+#~ msgid "_Browse..."
+#~ msgstr "����(_M)..."
+
+#~ msgid "The meeting status has changed. Send an updated version?"
+#~ msgstr "�|ij���p�w�ܧ�C�O�_�ǰe��s�L����T�H"
+
+# calendar/gui/e-day-view.c:3164
+# calendar/gui/e-week-view.c:3294
+#~ msgid "_Delete this Appointment"
+#~ msgstr "�R���o�Ӭ��|(_D)"
+
+# camel/camel-tcp-stream-openssl.c:423
+#~ msgid ""
+#~ "Issuer: %s\n"
+#~ "Subject: %s"
+#~ msgstr ""
+#~ "�o��̡G%s\n"
+#~ "�D���G%s"
+
+# shell/e-storage.c:467
+#, fuzzy
+#~ msgid "I/O Error: %s"
+#~ msgstr "��X/�J���~"
+
+# camel/providers/smtp/camel-smtp-transport.c:313
+#~ msgid "Welcome response error: %s: possibly non-fatal"
+#~ msgstr "�Ǧ^ Welcome �o�Ϳ��~�G%s�G �i��O�D�Y�������~"
+
+# camel/providers/smtp/camel-smtp-transport.c:676
+#~ msgid "HELO request timed out: %s: non-fatal"
+#~ msgstr "HELO ���n�D�O�ɡG%s�G �D�Y�������~"
+
+# camel/providers/smtp/camel-smtp-transport.c:695
+#~ msgid "HELO response error: %s: non-fatal"
+#~ msgstr "�Ǧ^ HELO ���^�����~�G%s�G �D�Y�������~"
+
+# camel/providers/smtp/camel-smtp-transport.c:1066
+#~ msgid "QUIT request timed out: %s: non-fatal"
+#~ msgstr "QUIT ���n�D�O�ɡG %s�G�D�Y�������~"
+
+# ui/evolution-message-composer.xml.h:49
+#~ msgid "Insert File"
+#~ msgstr "���J�ɮ�"
+
+#, fuzzy
+#~ msgid "You have chosen an invalid date."
+#~ msgstr "���C�z����F�@�ӵL�Ī�����C"
+
+#~ msgid ""
+#~ "The message's date will be compared against\n"
+#~ "whatever the time is when the filter is run\n"
+#~ "or vfolder is opened."
+#~ msgstr ""
+#~ "�l�󪺤���N�Q���\n"
+#~ "�L�׹L�o������ε�����Ƨ��}��\n"
+#~ "���ɶ�����C"
+
+# mail/mail-account-editor.c:173
+#~ msgid "Evolution News Editor"
+#~ msgstr "Evolution �s�D�s�边"
+
+# mail/mail-accounts.c:418
+# mail/mail-accounts.c:422
+#~ msgid "Are you sure you want to delete this news account?"
+#~ msgstr "�z�T�w�n�R���o�ӷs�D�b���H"
+
+# mail/mail-callbacks.c:351
+#~ msgid "You must configure an account before you can send this email."
+#~ msgstr "�z�����n���]�w�@�ӱb���~�i�H�ǰe�o�ʶl��C"
+
+# addressbook/gui/component/addressbook-config.c:148
+#~ msgid "NNTP Server:"
+#~ msgstr "NNTP ���A���G"
+
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#, fuzzy
+#~ msgid "News Servers"
+#~ msgstr "�s�D�o�e���A��(_N)"
+
+# addressbook/gui/widgets/e-addressbook-view.c:735
+#~ msgid "Source"
+#~ msgstr "�ӷ�"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:395
+#~ msgid "Source Information"
+#~ msgstr "�ӷ���T"
+
+#~ msgid "newswindow1"
+#~ msgstr "�s�D���� 1"
+
+# mail/mail-display.c:297
+#~ msgid "Save to Disk..."
+#~ msgstr "�x�s�ܺϺ�..."
+
+# mail/mail-callbacks.c:1188
+#, fuzzy
+#~ msgid "View messages..."
+#~ msgstr "�t�s�l��..."
+
+# shell/e-shell-folder-creation-dialog.c:263
+#~ msgid "Evolution - Create new folder"
+#~ msgstr "Evolution - �s�W��Ƨ�"
+
+# shell/e-shell-folder-selection-dialog.c:96
+#~ msgid ""
+#~ "The type of the selected folder is not valid for\n"
+#~ "the requested operation."
+#~ msgstr ""
+#~ "��w��Ƨ������O���A�Ω�\n"
+#~ "�ҭn�D���ʧ@�C"
+
+# ui/evolution-addressbook.xml.h:17
+#~ msgid "_Contact List"
+#~ msgstr "�s���H�M��(_C)"
+
+# ui/evolution-message-composer.xml.h:10
+#~ msgid "Inline Text _File..."
+#~ msgstr "�¤�r�ɮ�(_F)..."
+
+# ui/evolution-message-composer.xml.h:9
+#~ msgid "Insert a file as text into the message"
+#~ msgstr "�N�ɮץH�¤�r�榡���[��l��"
+
+# ui/evolution-message-composer.xml.h:10
+#~ msgid "Insert text file..."
+#~ msgstr "���J�¤�r�ɮ�..."
+
+# ui/evolution-message-composer.xml.h:27
+#~ msgid "Send _Later"
+#~ msgstr "�y��ǰe(_L)"
+
+# ui/evolution-message-composer.xml.h:28
+#~ msgid "Send _later"
+#~ msgstr "�y��ǰe(_L)"
+
+# ui/evolution-message-composer.xml.h:30
+#~ msgid "Send the message later"
+#~ msgstr "�y��ǰe�l��"
+
+# ui/evolution-mail.xml.h:110
+#, fuzzy
+#~ msgid "_Pilot Settings..."
+#~ msgstr "�l��]�w(_M)..."
+
 # addressbook/backend/ebook/e-card.c:3314
 #~ msgid "Card: "
 #~ msgstr "�W���G"
@@ -33234,14 +33819,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "��ƾ�K�n����u�t."
 
-# ui/evolution-calendar.xml.h:5
-#~ msgid "Create a new appointment"
-#~ msgstr "�إߤ@�ӷs�����|"
-
-# ui/evolution-tasks.xml.h:2
-#~ msgid "Create a new task"
-#~ msgstr "�إߤ@�ӷs���u�@"
-
 # ui/evolution-tasks.xml.h:3
 #~ msgid "New _Task"
 #~ msgstr "�s�W�u�@(_T)"
@@ -33482,10 +34059,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ "it."
 #~ msgstr "�o�N�|�ϥ� Kerberos 4 �����Ҥ�k�s�u�� POP  ���A���C"
 
-# camel/providers/pop3/camel-pop3-store.c:199
-#~ msgid "Could not authenticate to KPOP server: %s"
-#~ msgstr "�L�k���ҵn�J KPOP ���A���G%s"
-
 # camel/providers/pop3/camel-pop3-store.c:215
 #~ msgid "Could not connect to server: %s"
 #~ msgstr "������s�u����A���G%s"
@@ -33534,11 +34107,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "Mail storage folder (internal)"
 #~ msgstr "�l���x�s��Ƨ�(������)"
 
-# camel/providers/pop3/camel-pop3-store.c:215
-#, fuzzy
-#~ msgid "Cannot connect to store: %s"
-#~ msgstr "������s�u����A���G%s"
-
 # ui/evolution-mail.xml.h:109
 #~ msgid "New _Mail Message"
 #~ msgstr "�s�W�l��(_M)"
@@ -33604,11 +34172,6 @@ msgstr "init_bonobo()�G�����l�� Bonobo"
 #~ msgid "_Organization:"
 #~ msgstr "����(_O)�G"
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
-#~ msgid "_Remember this password"
-#~ msgstr "�O�U�o�ӱK�X(_R)"
-
 # mail/mail-config.glade.h:64
 #~ msgid "_Send mail in HTML format by default."
 #~ msgstr "�w�]�ϥ� HTML �榡�ǰe�l��(_S)"